Applyed Commit:468145e2ae8f6c4a5ed95a17fd4b67b9927f6c28

* Hotfix. Fixed merge errors.

src/core/UBApplicationController.cpp

@@ -134,13 +134,13 @@ void UBApplicationController::initViewState(int horizontalPosition, int vertical
 
 void UBApplicationController::initScreenLayout(bool useMultiscreen)
 {
-    mDisplayManager->setAsControl(mMainWindow);
+    mDisplayManager->setControlWidget(mMainWindow);
-    mDisplayManager->setAsDisplay(mDisplayView);
+    mDisplayManager->setDisplayWidget(mDisplayView);
 
-    mDisplayManager->setAsPreviousDisplays(mPreviousViews);
+    mDisplayManager->setPreviousDisplaysWidgets(mPreviousViews);
-    mDisplayManager->setAsDesktop(mUninoteController->drawingView());
+    mDisplayManager->setDesktopWidget(mUninoteController->drawingView());
 
-    mDisplayManager->setUseMultiScreen(bMultiScreen);
+    mDisplayManager->setUseMultiScreen(useMultiscreen);
     mDisplayManager->adjustScreens(-1);
 }
 
@@ -635,12 +635,12 @@ void UBApplicationController::mirroringEnabled(bool enabled)
         if (enabled)
         {
             mMirror->start();
-            mDisplayManager->setAsDisplay(mMirror);
+            mDisplayManager->setDisplayWidget(mMirror);
 
         }
         else
         {
-            mDisplayManager->setAsDisplay(mDisplayView);
+            mDisplayManager->setDisplayWidget(mDisplayView);
             mMirror->stop();
         }
 
@@ -650,7 +650,7 @@ void UBApplicationController::mirroringEnabled(bool enabled)
     }
     else
     {
-        mDisplayManager->setAsDisplay(mDisplayView);
+        mDisplayManager->setDisplayWidget(mDisplayView);
     }
 }
 

src/core/UBDisplayManager.cpp

@@ -118,7 +118,7 @@ int UBDisplayManager::numPreviousViews()
 }
 
 
-void UBDisplayManager::setAsControl(QWidget* pControlWidget, bool init)
+void UBDisplayManager::setControlWidget(QWidget* pControlWidget)
 {
     if(hasControl() && pControlWidget && (pControlWidget != mControlWidget))
     {
@@ -130,7 +130,7 @@ void UBDisplayManager::setAsControl(QWidget* pControlWidget, bool init)
     }
 }
 
-void UBDisplayManager::setAsDesktop(QWidget* pControlWidget )
+void UBDisplayManager::setDesktopWidget(QWidget* pControlWidget )
 {
     if(pControlWidget && (pControlWidget != mControlWidget))
     {
@@ -142,7 +142,7 @@ void UBDisplayManager::setAsDesktop(QWidget* pControlWidget )
     }
 }
 
-void UBDisplayManager::setAsDisplay(QWidget* pDisplayWidget)
+void UBDisplayManager::setDisplayWidget(QWidget* pDisplayWidget)
 {
     if(pDisplayWidget && (pDisplayWidget != mDisplayWidget))
     {
@@ -155,7 +155,7 @@ void UBDisplayManager::setAsDisplay(QWidget* pDisplayWidget)
 }
 
 
-void UBDisplayManager::setAsPreviousDisplays(QList<UBBoardView*> pPreviousViews)
+void UBDisplayManager::setPreviousDisplaysWidgets(QList<UBBoardView*> pPreviousViews)
 {
     mPreviousDisplayWidgets = pPreviousViews;
 }
@@ -171,7 +171,7 @@ QRect UBDisplayManager::displayGeometry()
     return mDesktop->screenGeometry(mDisplayScreenIndex);
 }
 
-void UBDisplayManager::swapScreens(bool swap)
+void UBDisplayManager::reinitScreens(bool swap)
 {
     Q_UNUSED(swap);
     adjustScreens(-1);