Changeset 54648 in vbox

Timestamp:

Mar 5, 2015 1:30:59 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt and Debugger UI: 6227: Omitting some of the dependencies for COM stuff.

Location:

trunk

Files:

• include/VBox/dbggui.h (modified) (1 diff)
• src/VBox/Debugger/VBoxDbg.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (4 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h (modified) (2 diffs)

trunk/include/VBox/dbggui.h

@@ -28 +28 @@
 
 #include <VBox/types.h>
-#if defined(RT_OS_WINDOWS)
-# include <VirtualBox.h>
-#else
-# include <VirtualBox_XPCOM.h>
-#endif
 
 

trunk/src/VBox/Debugger/VBoxDbg.cpp

@@ -21 +21 @@
 #define LOG_GROUP LOG_GROUP_DBGG
 #define VBOX_COM_NO_ATL
+#ifdef RT_OS_WINDOWS
+# include <VirtualBox.h>
+#else /* !RT_OS_WINDOWS */
+# include <VirtualBox_XPCOM.h>
+#endif /* !RT_OS_WINDOWS */
 #include <VBox/dbggui.h>
 #include <VBox/vmm/vm.h>

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

@@ -27 +27 @@
 # include <QTimer>
 # include <QDateTime>
+# include <QImageWriter>
 # ifdef Q_WS_MAC
 #  include <QMenuBar>
 # endif /* Q_WS_MAC */
+# ifdef Q_WS_X11
+#  include <QX11Info>
+# endif /* Q_WS_X11 */
 
 /* GUI includes: */
@@ -66 +70 @@
 # endif /* Q_WS_MAC */
 
-/* VirtualBox interface declarations: */
-#ifndef VBOX_WITH_XPCOM
-# include "VirtualBox.h"
-#else /* !VBOX_WITH_XPCOM */
-# include "VirtualBox_XPCOM.h"
-#endif /* VBOX_WITH_XPCOM */
-
 /* COM includes: */
 # include "CVirtualBoxErrorInfo.h"
@@ -94 +91 @@
 # include <iprt/path.h>
 # ifdef VBOX_WITH_DEBUGGER_GUI
+#  include <VBox/dbggui.h>
 #  include <iprt/ldr.h>
 # endif /* VBOX_WITH_DEBUGGER_GUI */
@@ -99 +97 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-#include <QImageWriter>
+/* VirtualBox interface declarations: */
+#ifndef VBOX_WITH_XPCOM
+# include "VirtualBox.h"
+#else /* !VBOX_WITH_XPCOM */
+# include "VirtualBox_XPCOM.h"
+#endif /* VBOX_WITH_XPCOM */
 
 #ifdef Q_WS_MAC
 # include "DarwinKeyboard.h"
-#endif
+#endif /* Q_WS_MAC */
 #ifdef Q_WS_WIN
 # include "WinKeyboard.h"
-#endif
-
-/* External includes: */
+#endif /* Q_WS_WIN */
 #ifdef Q_WS_X11
 # include <XKeyboard.h>
-# include <QX11Info>
 #endif /* Q_WS_X11 */
 

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

@@ -21 +21 @@
 #include "UIExtraDataDefs.h"
 #include <QIWithRetranslateUI.h>
-#ifdef VBOX_WITH_DEBUGGER_GUI
-# include <VBox/dbggui.h>
-#endif /* VBOX_WITH_DEBUGGER_GUI */
 
 /* COM includes: */
@@ -50 +47 @@
 class CVirtualBoxErrorInfo;
 
+#ifdef VBOX_WITH_DEBUGGER_GUI
+typedef struct DBGGUIVT const *PCDBGGUIVT;
+typedef struct DBGGUI *PDBGGUI;
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
 /* Machine logic interface: */
 class UIMachineLogic : public QIWithRetranslateUI3<QObject>