Changeset 44981 in vbox

Timestamp:

Mar 11, 2013 12:15:26 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84202

Message:

FE/Qt: Runtime UI: Little cleanup for fullscreen logic.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineLogic.h (modified) (2 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• fullscreen/UIMachineLogicFullscreen.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -168 +168 @@
     /* Prepare action connections: */
     prepareActionConnections();
+
+    /* Prepare other connections: */
+    prepareOtherConnections();
 
     /* Prepare handlers: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -130 +130 @@
     virtual void prepareActionGroups();
     virtual void prepareActionConnections();
+    virtual void prepareOtherConnections() {}
     virtual void prepareHandlers();
     virtual void prepareMachineWindows() = 0;
@@ -150 +151 @@
     virtual void cleanupMachineWindows() = 0;
     virtual void cleanupHandlers();
+    //virtual void cleanupOtherConnections() {}
     //virtual void cleanupActionConnections() {}
     virtual void cleanupActionGroups();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -92 +92 @@
 }
 
-void UIMachineLogicFullscreen::prepare()
-{
-    /* Call to base-class: */
-    UIMachineLogic::prepare();
-
-#ifdef Q_WS_MAC
-    /* Prepare fullscreen connections: */
-    prepareFullscreenConnections();
-#endif /* Q_WS_MAC */
-}
-
 int UIMachineLogicFullscreen::hostScreenForGuestScreen(int iScreenId) const
 {
@@ -158 +147 @@
     pMenu->setVisible(true);
 }
+
+#ifdef Q_WS_MAC
+void UIMachineLogicFullscreen::prepareOtherConnections()
+{
+    /* Presentation mode connection: */
+    connect(gEDataEvents, SIGNAL(sigPresentationModeChange(bool)),
+            this, SLOT(sltChangePresentationMode(bool)));
+}
+#endif /* Q_WS_MAC */
 
 void UIMachineLogicFullscreen::prepareMachineWindows()
@@ -195 +193 @@
     setMachineWindowsCreated(true);
 }
-
-#ifdef Q_WS_MAC
-void UIMachineLogicFullscreen::prepareFullscreenConnections()
-{
-    /* Presentation mode connection: */
-    connect(gEDataEvents, SIGNAL(sigPresentationModeChange(bool)),
-            this, SLOT(sltChangePresentationMode(bool)));
-}
-#endif /* Q_WS_MAC */
 
 void UIMachineLogicFullscreen::cleanupMachineWindows()

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h

@@ -40 +40 @@
     bool checkAvailability();
 
-    /* Prepare logic: */
-    void prepare();
-
     /* Multi-screen stuff: */
     int hostScreenForGuestScreen(int iScreenId) const;
@@ -60 +57 @@
     /* Prepare helpers: */
     void prepareActionGroups();
+#ifdef Q_WS_MAC
+    void prepareOtherConnections();
+#endif /* Q_WS_MAC */
     void prepareMachineWindows();
-#ifdef Q_WS_MAC
-    void prepareFullscreenConnections();
-#endif /* Q_WS_MAC */
 
     /* Cleanup helpers: */
+    void cleanupMachineWindows();
 #ifdef Q_WS_MAC
-    //void cleanupCommonConnections() {}
+    //void cleanupOtherConnections() {}
 #endif /* Q_WS_MAC */
-    void cleanupMachineWindows();
     void cleanupActionGroups();