fixed some issue due to merge

src/core/UBDisplayManager.cpp

@@ -48,7 +48,7 @@ UBDisplayManager::UBDisplayManager(QObject *parent)
 
 void UBDisplayManager::initScreenIndexes()
 {
-    int screenCount = 1;//= numScreens();
+    int screenCount = numScreens();
 
     mScreenIndexesRoles.clear();
 

src/core/UBSettings.h

@@ -273,8 +273,6 @@ class UBSettings : public QObject
 
         QMap<DocumentSizeRatio::Enum, QSize> documentSizes;
 
-        QSize defaultDocumentSize;
-
         UBSetting* svgViewBoxMargin;
         UBSetting* pdfMargin;
         UBSetting* pdfPageFormat;

src/document/UBDocumentProxy.cpp

@@ -48,7 +48,7 @@ void UBDocumentProxy::init()
 
     setUuid(QUuid::createUuid());
 
-    setDefaultDocumentSize(UBSettings::settings()->defaultDocumentSize);
+    setDefaultDocumentSize(UBSettings::settings()->pageSize->get().toSize());
 
     setSessionTitle("");
     setSessionTarget("");

src/domain/UBGraphicsScene.cpp

@@ -1770,7 +1770,6 @@ void UBGraphicsScene::addMask(const QPointF &center)
 
     QRectF rect = UBApplication::boardController->activeScene()->normalizedSceneRect();
     rect.setRect(center.x() - rect.width()/4, center.y() - rect.height()/4, rect.width()/2 , rect.height()/2);
-    QPointF origin = center.isNull() ? rect.bottomRight() : center;
     curtain->setRect(rect);
     UBGraphicsItem::assignZValue(curtain, toolLayerStart + toolOffsetCurtain);
 

src/gui/UBActionPalette.cpp

@@ -57,12 +57,10 @@ void UBActionPalette::init(Qt::Orientation orientation)
     mToolButtonStyle = Qt::ToolButtonIconOnly;
     mButtons.clear();
 
-    QBoxLayout *layout = 0;
-
     if (orientation == Qt::Horizontal)
-        layout = new QHBoxLayout(this);
+        new QHBoxLayout(this);
     else
-        layout = new QVBoxLayout(this);
+        new QVBoxLayout(this);
 
     updateLayout();
 }

src/gui/UBMediaPlayer.cpp

@@ -350,6 +350,7 @@ void UBMediaPlayer::hasVideoChanged(bool bHasVideo)
 
 void UBMediaPlayer::resizeEvent(QResizeEvent* pEvent)
 {
+    Q_UNUSED(pEvent);
 //    int origWidth = m_videoWindow.width();
 //    int origHeight = m_videoWindow.height();