Changeset 42350 in vbox

Timestamp:

Jul 24, 2012 11:35:32 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: fix r79395: never call virtual functions from a base class constructor.

Location:

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

Files:

• UIMachineView.cpp (modified) (3 diffs)
• UIMachineView.h (modified) (1 diff)

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

@@ -151 +151 @@
             break;
     }
+
+    /* Prepare common things: */
+    pMachineView->prepareCommon();
+
+    /* Prepare event-filters: */
+    pMachineView->prepareFilters();
+
+    /* Prepare connections: */
+    pMachineView->prepareConnections();
+
+    /* Prepare console connections: */
+    pMachineView->prepareConsoleConnections();
+
+    /* Initialization: */
     pMachineView->sltMachineStateChanged();
     /** @todo Can we move the call to sltAdditionsStateChanged() from the
@@ -156 +170 @@
      * but not for Fullscreen and Scale.  However for Scale it is a no op.,
      * so it would not hurt.  Would it hurt for Fullscreen? */
+
     return pMachineView;
 }
@@ -275 +290 @@
     /* Prepare frame buffer: */
     prepareFrameBuffer();
-
-    /* Prepare common things: */
-    prepareCommon();
-
-    /* Prepare event-filters: */
-    prepareFilters();
-
-    /* Prepare connections: */
-    prepareConnections();
-
-    /* Prepare console connections: */
-    prepareConsoleConnections();
 }
 

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

@@ -111 +111 @@
 
     /* Prepare routines: */
-    virtual void prepareViewport();
-    virtual void prepareFrameBuffer();
+    void prepareViewport();
+    void prepareFrameBuffer();
     virtual void prepareCommon();
     virtual void prepareFilters();
     virtual void prepareConnections();
     virtual void prepareConsoleConnections();
-    virtual void loadMachineViewSettings();
+    void loadMachineViewSettings();
 
     /* Cleanup routines: */