Changeset 11820 in vbox for trunk/src/VBox/Main/ConsoleImpl.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/ConsoleImpl.cpp (modified) (15 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -285 +285 @@
     AssertComRCReturnRC (rc);
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     rc = mMachine->COMGETTER(VRDPServer) (unconst (mVRDPServer).asOutParam());
     AssertComRCReturnRC (rc);
@@ -447 +447 @@
     unconst (mFloppyDrive).setNull();
     unconst (mDVDDrive).setNull();
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     unconst (mVRDPServer).setNull();
 #endif
@@ -645 +645 @@
     AssertComRCReturnVoid (autoCaller.rc());
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     uint32_t u32Clients = ASMAtomicIncU32(&mcVRDPClients);
 
@@ -657 +657 @@
     NOREF(u32ClientId);
     mDisplay->VideoAccelVRDP (true);
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
     LogFlowFuncLeave();
@@ -673 +673 @@
     AssertReturnVoid (mConsoleVRDPServer);
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     uint32_t u32Clients = ASMAtomicDecU32(&mcVRDPClients);
 
@@ -684 +684 @@
 
     mDisplay->VideoAccelVRDP (false);
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
     if (fu32Intercepted & VRDP_CLIENT_INTERCEPT_USB)
@@ -691 +691 @@
     }
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     if (fu32Intercepted & VRDP_CLIENT_INTERCEPT_CLIPBOARD)
     {
@@ -713 +713 @@
         }
     }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
     Guid uuid;
@@ -741 +741 @@
     NOREF(u32ClientId);
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     mcAudioRefs++;
 
@@ -785 +785 @@
     AssertReturnVoid (mConsoleVRDPServer);
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
     mConsoleVRDPServer->ClipboardCreate (u32ClientId);
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
     LogFlowFuncLeave();
@@ -4340 +4340 @@
 
 
-#ifdef VBOX_HGCM
+#ifdef VBOX_WITH_HGCM
     /*
      *  Shutdown HGCM services before stopping the guest, because they might need a cleanup.
@@ -4405 +4405 @@
                                       ComSafeArrayAsInParam (flags));
 # endif /* VBOX_WITH_GUEST_PROPS defined */
-#endif /* VBOX_HGCM */
+#endif /* VBOX_WITH_HGCM */
 
     /* First, wait for all mpVM callers to finish their work if necessary */
@@ -6208 +6208 @@
     do
     {
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
         /* Create the VRDP server. In case of headless operation, this will
          * also create the framebuffer, required at VM creation.
@@ -6247 +6247 @@
             break;
         }
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
         /*
@@ -6265 +6265 @@
         alock.enter();
 
-#ifdef VBOX_VRDP
+#ifdef VBOX_WITH_VRDP
         /* Enable client connections to the server. */
         console->consoleVRDPServer()->EnableConnections ();
-#endif /* VBOX_VRDP */
+#endif /* VBOX_WITH_VRDP */
 
         if (VBOX_SUCCESS (vrc))