Changeset 29803 in vbox

Timestamp:

May 26, 2010 9:36:14 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: more cleanup (this is used since ages ago)

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (2 diffs)
• src/globals/VBoxGlobal.cpp (modified) (1 diff)
• src/globals/VBoxProblemReporter.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -100 +100 @@
 endif
 
-VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
+VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
 VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
@@ -721 +721 @@
                 '-DGC_ARCH_BITS=64' \
                 '-DVBOX_WITH_XPCOM' \
-                '-DVBOX_GUI_SEPARATE_VM_PROCESS' \
                 '-DVBOX_WITH_REGISTRATION' \
                 '-DVBOX_WITH_REGISTRATION_REQUEST' \

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -984 +984 @@
     }
 
-#if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
-
     AssertMsg (!vboxGlobal().isVMConsoleProcess(),
                ("Must NOT be a VM console process"));
@@ -1044 +1042 @@
 
     session.Close();
-
-#else // !VBOX_GUI_SEPARATE_VM_PROCESS
-
-    if (!vboxGlobal().startMachine (id))
-        return;
-
-    hide();
-
-#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -727 +727 @@
 VBoxSelectorWnd &VBoxGlobal::selectorWnd()
 {
-#if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
     AssertMsg (!vboxGlobal().isVMConsoleProcess(),
                ("Must NOT be a VM console process"));
-#endif
-
     Assert (mValid);
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp

@@ -286 +286 @@
         return 0;
 
-#if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
     if (vboxGlobal().isVMConsoleProcess())
     {
@@ -297 +296 @@
             return &vboxGlobal().selectorWnd(); /* return that window */
     }
-#else
-    if (vboxGlobal().vmWindow() && vboxGlobal().vmWindow().isVisible()) /* VM window is visible */
-        return &vboxGlobal().vmWindow(); /* return that window */
-    if (vboxGlobal().selectorWnd().isVisible()) /* VM selector is visible */
-        return &vboxGlobal().selectorWnd(); /* return that window */
-#endif
 
     return 0;