Changeset 11820 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Aug 29, 2008 2:09:39 PM (17 years ago)

Author:

vboxsync

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

35651

Message:

made Qt4 the default GUI; VBOX_VRDP => VBOX_WITH_VRDP; VBOX_HGCM => VBOX_WITH_HGCM; Makefile cleanup

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (16 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1275 +1275 @@
 STDMETHODIMP Machine::COMGETTER(VRDPServer)(IVRDPServer **vrdpServer)
 {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (!vrdpServer)
         return E_POINTER;
@@ -3624 +3624 @@
 
     Bstr type (aType);
-    if (type == "gui" || type == "GUI/Qt3")
-    {
-#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
-        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM3";
-#else
-        const char VirtualBox_exe[] = "VirtualBox3" HOSTSUFF_EXE;
-#endif
+
+    /* Qt4 is default */
+#ifdef VBOX_WITH_QT4GUI
+    if (type == "gui" || type == "GUI/Qt4")
+    {
+# ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
+        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
+# else
+        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
+# endif
         Assert (sz >= sizeof (VirtualBox_exe));
         strcpy (cmd, VirtualBox_exe);
 
         Utf8Str idStr = mData->mUuid.toString();
-#ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
+# ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
         const char * args[] = {path, "-startvm", idStr, 0 };
-#else
+# else
         Utf8Str name = mUserData->mName;
         const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
-#endif
+# endif
         vrc = RTProcCreate (path, args, env, 0, &pid);
     }
+#else /* !VBOX_WITH_QT4GUI */
+    if (0)
+        ;
+#endif /* VBOX_WITH_QT4GUI */
+
     else
-    if (type == "GUI/Qt4")
-    {
-#ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
-        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM";
-#else
-        const char VirtualBox_exe[] = "VirtualBox" HOSTSUFF_EXE;
-#endif
+
+    /* Qt3 is used sometimes as well, OS/2 does not have Qt4 at all */
+#ifdef VBOX_WITH_QTGUI
+    if (type == "gui" || type == "GUI/Qt3")
+    {
+# ifdef RT_OS_DARWIN /* Avoid Lanuch Services confusing this with the selector by using a helper app. */
+        const char VirtualBox_exe[] = "../Resources/VirtualBoxVM.app/Contents/MacOS/VirtualBoxVM3";
+# else
+        const char VirtualBox_exe[] = "VirtualBox3" HOSTSUFF_EXE;
+# endif
         Assert (sz >= sizeof (VirtualBox_exe));
         strcpy (cmd, VirtualBox_exe);
 
         Utf8Str idStr = mData->mUuid.toString();
-#ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
+# ifdef RT_OS_WINDOWS /** @todo drop this once the RTProcCreate bug has been fixed */
         const char * args[] = {path, "-startvm", idStr, 0 };
-#else
+# else
         Utf8Str name = mUserData->mName;
         const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
-#endif
+# endif
         vrc = RTProcCreate (path, args, env, 0, &pid);
     }
+#else /* !VBOX_WITH_QTGUI */
+    if (0)
+        ;
+#endif /* !VBOX_WITH_QTGUI */
+
     else
-#ifdef VBOX_VRDP
+
+#ifdef VBOX_WITH_VRDP
     if (type == "vrdp")
     {
@@ -3672 +3689 @@
 
         Utf8Str idStr = mData->mUuid.toString();
-#ifdef RT_OS_WINDOWS
+# ifdef RT_OS_WINDOWS
         const char * args[] = {path, "-startvm", idStr, 0 };
-#else
+# else
         Utf8Str name = mUserData->mName;
         const char * args[] = {path, "-comment", name, "-startvm", idStr, 0 };
-#endif
+# endif
         vrc = RTProcCreate (path, args, env, 0, &pid);
     }
+#else /* !VBOX_WITH_VRDP */
+    if (0)
+        ;
+#endif /* !VBOX_WITH_VRDP */
+
     else
-#endif /* VBOX_VRDP */
+
+#ifdef VBOX_WITH_HEADLESS
     if (type == "capture")
     {
@@ -3689 +3712 @@
 
         Utf8Str idStr = mData->mUuid.toString();
-#ifdef RT_OS_WINDOWS
+# ifdef RT_OS_WINDOWS
         const char * args[] = {path, "-startvm", idStr, "-capture", 0 };
-#else
+# else
         Utf8Str name = mUserData->mName;
         const char * args[] = {path, "-comment", name, "-startvm", idStr, "-capture", 0 };
-#endif
+# endif
         vrc = RTProcCreate (path, args, env, 0, &pid);
     }
+#else /* !VBOX_WITH_HEADLESS */
+    if (0)
+        ;
+#endif /* !VBOX_WITH_HEADLESS */
     else
     {
@@ -4123 +4150 @@
     mBIOSSettings->init (this);
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     /* create an associated VRDPServer object (default is disabled) */
     unconst (mVRDPServer).createObject();
@@ -4252 +4279 @@
     }
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mVRDPServer)
     {
@@ -4808 +4835 @@
     }
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     /* RemoteDisplay */
     rc = mVRDPServer->loadSettings (aNode);
@@ -6193 +6220 @@
     }
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     /* VRDP settings (optional) */
     rc = mVRDPServer->saveSettings (aNode);
@@ -7275 +7302 @@
         mHWData.isBackedUp() ||
         mHDData.isBackedUp() ||
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
         (mVRDPServer && mVRDPServer->isModified()) ||
 #endif
@@ -7318 +7345 @@
         /* ignore mHDData */
         //mHDData.hasActualChanges() ||
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
         (mVRDPServer && mVRDPServer->isReallyModified()) ||
 #endif
@@ -7394 +7421 @@
         mBIOSSettings->rollback();
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (mVRDPServer)
         vrdpChanged = mVRDPServer->rollback();
@@ -7495 +7522 @@
 
     mBIOSSettings->commit();
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     mVRDPServer->commit();
 #endif
@@ -7561 +7588 @@
 
     mBIOSSettings->copyFrom (aThat->mBIOSSettings);
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     mVRDPServer->copyFrom (aThat->mVRDPServer);
 #endif
@@ -7808 +7835 @@
     unconst (mBIOSSettings).createObject();
     mBIOSSettings->init (this, aMachine->mBIOSSettings);
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     /* create another VRDPServer object that will be mutable */
     unconst (mVRDPServer).createObject();
@@ -10566 +10593 @@
     mBIOSSettings->initCopy (this, mPeer->mBIOSSettings);
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     unconst (mVRDPServer).createObject();
     mVRDPServer->initCopy (this, mPeer->mVRDPServer);
@@ -10668 +10695 @@
     mBIOSSettings->init (this);
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     unconst (mVRDPServer).createObject();
     mVRDPServer->init (this);