Changeset 51404 in vbox

Timestamp:

May 26, 2014 5:10:44 PM (11 years ago)

Author:

vboxsync

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

93933

Message:

FE/Qt: 6749: Cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/main.cpp (modified) (3 diffs)
• src/runtime/UIFrameBufferQImage.cpp (modified) (2 diffs)
• src/runtime/UIFrameBufferQImage.h (modified) (2 diffs)
• src/runtime/UIMachineView.cpp (modified) (2 diffs)

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

@@ -80 +80 @@
 VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_QUARTZ2D VBOX_WITH_TRANSLUCENT_SEAMLESS
-VirtualBox_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE
-VirtualBox_DEFS.linux     = VBOX_GUI_USE_QIMAGE
-VirtualBox_DEFS.netbsd    = VBOX_GUI_USE_QIMAGE
-VirtualBox_DEFS.openbsd   = VBOX_GUI_USE_QIMAGE
-VirtualBox_DEFS.solaris   = VBOX_GUI_USE_QIMAGE
-VirtualBox_DEFS.win       = VBOX_GUI_USE_QIMAGE UNICODE QT_DLL
+VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_WITH_TRANSLUCENT_SEAMLESS
+VirtualBox_DEFS.win       = UNICODE QT_DLL
 ifdef VBOX_WITH_ICHAT_THEATER
  VirtualBox_DEFS.darwin += VBOX_WITH_ICHAT_THEATER
@@ -979 +974 @@
                 '-DMAC_OS_X_VERSION_MAX_ALLOWED=1050' \
                 '-DVBOX_GUI_USE_QUARTZ2D' \
-                '-DVBOX_GUI_USE_QIMAGE' \
                 '-o' $@ $<
 endif

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

@@ -224 +224 @@
 static void showHelp()
 {
-    QString mode = "", dflt = "";
-#ifdef VBOX_GUI_USE_QIMAGE
-    if (!mode.isEmpty())
-        mode += "|";
-    mode += "image";
-#endif /* VBOX_GUI_USE_QIMAGE */
-#ifdef VBOX_GUI_USE_QUARTZ2D
-    if (!mode.isEmpty())
-        mode += "|";
-    mode += "quartz2d";
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-#if defined(Q_WS_MAC) && defined(VBOX_GUI_USE_QUARTZ2D)
-    dflt = "quartz2d";
-#elif defined(VBOX_GUI_USE_QIMAGE)
-    dflt = "image";
-#else
-# error "Cannot determine the default render mode!"
-#endif
-
     RTPrintf(VBOX_PRODUCT " Manager %s\n"
             "(C) 2005-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
@@ -251 +232 @@
             "  --seamless                 switch to seamless mode during startup\n"
             "  --fullscreen               switch to fullscreen mode during startup\n"
-            "  --rmode %-18s select different render mode (default is %s)\n"
             "  --no-startvm-errormsgbox   do not show a message box for VM start errors\n"
             "  --restore-current          restore the current snapshot before starting\n"
@@ -288 +268 @@
 # endif
             "\n",
-            RTBldCfgVersion(),
-            mode.toLatin1().constData(),
-            dflt.toLatin1().constData());
+            RTBldCfgVersion());
     /** @todo Show this as a dialog on windows. */
 }

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

@@ -17 +17 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
-#ifdef VBOX_GUI_USE_QIMAGE
 
 #ifdef VBOX_WITH_PRECOMPILED_HEADERS
@@ -384 +382 @@
 }
 
-#endif /* VBOX_GUI_USE_QIMAGE */
-

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

@@ -16 +16 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-
-#ifdef VBOX_GUI_USE_QIMAGE
 
 #ifndef ___UIFrameBufferQImage_h___
@@ -71 +69 @@
 
 #endif /* !___UIFrameBufferQImage_h___ */
-
-#endif /* VBOX_GUI_USE_QIMAGE */
-

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

@@ -414 +414 @@
     switch (rm)
     {
-#ifdef VBOX_GUI_USE_QIMAGE
         case RenderMode_QImage:
         {
@@ -447 +446 @@
             break;
         }
-#endif /* VBOX_GUI_USE_QIMAGE */
 
 #ifdef VBOX_GUI_USE_QUARTZ2D