Changeset 103538 in vbox

Timestamp:

Feb 22, 2024 5:06:26 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: Moving out logging stuff from UIDefs.h to separate UILoggingDefs.h; This breaks dependency of UIDefs/UICommon headers from VBox/log.h

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/COMDefs.cpp (modified) (2 diffs)
• globals/UICommon.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (2 diffs)
• globals/UIDesktopWidgetWatchdog.cpp (modified) (2 diffs)
• globals/UILoggingDefs.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h ) (2 diffs)
• globals/UIMainEventListener.cpp (modified) (1 diff)
• globals/UIPopupCenter.cpp (modified) (1 diff)
• guestctrl/UIFileManagerDialog.cpp (modified) (2 diffs)
• guestctrl/UIGuestProcessControlDialog.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerDialog.cpp (modified) (1 diff)
• main.cpp (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (1 diff)
• manager/tools/UIToolsModel.cpp (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (1 diff)
• medium/viso/UIVisoCreator.cpp (modified) (1 diff)
• networking/UINetworkReply.cpp (modified) (2 diffs)
• platform/darwin/DarwinKeyboard.cpp (modified) (2 diffs)
• platform/nix/VBoxUtils-nix.cpp (modified) (2 diffs)
• platform/nix/XKeyboard-new.cpp (modified) (1 diff)
• platform/win/WinKeyboard.cpp (modified) (1 diff)
• runtime/UIFrameBuffer.cpp (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UIMouseHandler.cpp (modified) (1 diff)
• runtime/UIMultiScreenLayout.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• runtime/fullscreen/UIMachineViewFullscreen.cpp (modified) (3 diffs)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• runtime/normal/UIMachineViewNormal.cpp (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• runtime/scale/UIMachineViewScale.cpp (modified) (2 diffs)
• runtime/scale/UIMachineWindowScale.cpp (modified) (1 diff)
• runtime/seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)
• runtime/seamless/UIMachineViewSeamless.cpp (modified) (2 diffs)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• settings/UIAdvancedSettingsDialog.cpp (modified) (1 diff)
• settings/UISettingsPageValidator.cpp (modified) (1 diff)
• snapshots/UISnapshotPane.cpp (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -58 +58 @@
 #include "UIExtraDataManager.h"
 #include "UIHostComboEditor.h"
+#include "UILoggingDefs.h"
 #include "UIMainEventListener.h"
 #include "UIMessageCenter.h"

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

@@ -31 +31 @@
 /* GUI includes: */
 #include "COMDefs.h"
+#include "UILoggingDefs.h"
 
 /* COM includes: */
@@ -37 +38 @@
 /* VirtualBox interface declarations: */
 #include <VBox/com/VirtualBox.h>
-
-/* Other VBox includes: */
-#include <iprt/log.h>
 
 #ifdef VBOX_WITH_XPCOM

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

@@ -68 +68 @@
 #include "UIFDCreationDialog.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UIMedium.h"
 #include "UIMediumEnumerator.h"

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -32 +32 @@
 #endif
 
-/* Define GUI log group: */
-// WORKAROUND:
-// This define should go *before* VBox/log.h include!
-#ifndef LOG_GROUP
-# define LOG_GROUP LOG_GROUP_GUI
-#endif
-
 /* Qt includes: */
 #include <QEvent>
@@ -45 +38 @@
 /* GUI includes: */
 #include "UILibraryDefs.h"
-
-/* Other VBox includes: */
-#include <VBox/log.h>
 
 

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

@@ -42 +42 @@
 /* GUI includes: */
 #include "UIDesktopWidgetWatchdog.h"
+#include "UILoggingDefs.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -60 +61 @@
 #include <iprt/assert.h>
 #include <iprt/ldr.h>
-#include <VBox/log.h>
 #ifdef VBOX_WS_WIN
 # include <iprt/win/windows.h>

trunk/src/VBox/Frontends/VirtualBox/src/globals/UILoggingDefs.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - Global definitions.
+ * VBox Qt GUI - Global logging definitions.
  */
 
@@ -26 +26 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_globals_UIDefs_h
-#define FEQT_INCLUDED_SRC_globals_UIDefs_h
+#ifndef FEQT_INCLUDED_SRC_globals_UILoggingDefs_h
+#define FEQT_INCLUDED_SRC_globals_UILoggingDefs_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
 #endif
 
-/* Define GUI log group: */
-// WORKAROUND:
-// This define should go *before* VBox/log.h include!
+/* Define GUI logging group,
+ * this define should go *before* VBox/log.h include! */
 #ifndef LOG_GROUP
 # define LOG_GROUP LOG_GROUP_GUI
 #endif
 
-/* Qt includes: */
-#include <QEvent>
-#include <QStringList>
-
-/* GUI includes: */
-#include "UILibraryDefs.h"
-
 /* Other VBox includes: */
 #include <VBox/log.h>
 
-
-/** Global namespace. */
-namespace UIDefs
-{
-    /** Additional Qt event types. */
-    enum UIEventType
-    {
-        ActivateActionEventType = QEvent::User + 101,
-#ifdef VBOX_WS_MAC
-        ShowWindowEventType,
-#endif
-    };
-
-    /** Default guest additions image name. */
-    SHARED_LIBRARY_STUFF extern const char* GUI_GuestAdditionsName;
-    /** Default extension pack name. */
-    SHARED_LIBRARY_STUFF extern const char* GUI_ExtPackName;
-
-    /** Allowed VBox file extensions. */
-    SHARED_LIBRARY_STUFF extern QStringList VBoxFileExts;
-    /** Allowed VBox Extension Pack file extensions. */
-    SHARED_LIBRARY_STUFF extern QStringList VBoxExtPackFileExts;
-    /** Allowed OVF file extensions. */
-    SHARED_LIBRARY_STUFF extern QStringList OVFFileExts;
-}
-using namespace UIDefs /* if header included */;
-
-
-#ifdef VBOX_WS_MAC
-/** Known macOS releases. */
-enum MacOSXRelease
-{
-    MacOSXRelease_Old,
-    MacOSXRelease_FirstUnknown = 9,
-    MacOSXRelease_SnowLeopard  = 10,
-    MacOSXRelease_Lion         = 11,
-    MacOSXRelease_MountainLion = 12,
-    MacOSXRelease_Mavericks    = 13,
-    MacOSXRelease_Yosemite     = 14,
-    MacOSXRelease_ElCapitan    = 15,
-    MacOSXRelease_Sierra       = 16,
-    MacOSXRelease_HighSierra   = 17,
-    MacOSXRelease_Mojave       = 18,
-    MacOSXRelease_Catalina     = 19,
-    MacOSXRelease_BigSur       = 20,
-    MacOSXRelease_Monterey     = 21,
-    MacOSXRelease_Ventura      = 22,
-    MacOSXRelease_Sonoma       = 23,
-    MacOSXRelease_LastUnknown  = 24,
-    MacOSXRelease_New,
-};
-#endif /* VBOX_WS_MAC */
-
-
-/** VM launch modes. */
-enum UILaunchMode
-{
-    UILaunchMode_Invalid,
-    UILaunchMode_Default,
-    UILaunchMode_Headless,
-    UILaunchMode_Separate
-};
-
-
-#endif /* !FEQT_INCLUDED_SRC_globals_UIDefs_h */
+#endif /* !FEQT_INCLUDED_SRC_globals_UILoggingDefs_h */

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

@@ -32 +32 @@
 /* GUI includes: */
 #include "UICommon.h"
+#include "UILoggingDefs.h"
 #include "UIMainEventListener.h"
 #include "UIMousePointerShapeData.h"

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

@@ -32 +32 @@
 #include "UIExtraDataManager.h"
 #include "UIHostComboEditor.h"
+#include "UILoggingDefs.h"
 #include "UIPopupCenter.h"
 #include "UIPopupStack.h"

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp

@@ -31 +31 @@
 
 /* GUI includes: */
+#include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
@@ -36 +37 @@
 #include "UIFileManager.h"
 #include "UIFileManagerDialog.h"
-#include "UICommon.h"
+#include "UILoggingDefs.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp

@@ -37 +37 @@
 #include "UIGuestControlConsole.h"
 #include "UIGuestProcessControlDialog.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UISession.h"

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

@@ -39 +39 @@
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UIVMLogViewerDialog.h"
 #include "UIVMLogViewerWidget.h"

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

@@ -37 +37 @@
 /* GUI includes: */
 #include "UICommon.h"
+#include "UILoggingDefs.h"
 #include "UIStarter.h"
 #include "UIModalWindowManager.h"

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -63 +63 @@
 #include "UIHelpBrowserDialog.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UIMedium.h"
 #include "UIMediumManager.h"

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -40 +40 @@
 #include "UIExtraDataManager.h"
 #include "UIChooser.h"
+#include "UILoggingDefs.h"
 #include "UIMessageCenter.h"
 #include "UINotificationCenter.h"

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -40 +40 @@
 #include "UICloudNetworkingStuff.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMessageCenter.h"
 #include "UINotificationCenter.h"

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -39 +39 @@
 #include "UIActionPoolManager.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UITools.h"
 #include "UIToolsHandlerMouse.h"

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -32 +32 @@
 #include "UICommon.h"
 #include "UIErrorString.h"
+#include "UILoggingDefs.h"
 #include "UIMediumEnumerator.h"
 #include "UINotificationCenter.h"

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -45 +45 @@
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UIMediumDetailsWidget.h"
 #include "UIMediumItem.h"

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -43 +43 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMediumSearchWidget.h"
 #include "UIMediumSelector.h"

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -48 +48 @@
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
+#include "UIModalWindowManager.h"
 #include "UIPaneContainer.h"
-#include "UIModalWindowManager.h"
 #include "UIVisoCreator.h"
 #include "UIVisoContentBrowser.h"

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkReply.cpp

@@ -34 +34 @@
 
 /* GUI includes: */
+#include "UILoggingDefs.h"
 #include "UINetworkReply.h"
 #include "UINetworkRequestManager.h"
@@ -53 +54 @@
 #include <iprt/string.h>
 #include <iprt/zip.h>
-#include <VBox/log.h>
 
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp

@@ -27 +27 @@
 
 /* Defines: */
-#define LOG_GROUP LOG_GROUP_GUI
 #define VBOX_WITH_KBD_LEDS_SYNC
 //#define VBOX_WITHOUT_KBD_LEDS_SYNC_FILTERING
 
 /* GUI includes: */
+#include "UILoggingDefs.h"
 #include "DarwinKeyboard.h"
 #ifndef USE_HID_FOR_MODIFIERS
@@ -42 +42 @@
 #include <iprt/mem.h>
 #include <iprt/time.h>
-#include <VBox/log.h>
 #ifdef DEBUG_PRINTF
 # include <iprt/stream.h>

trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp

@@ -39 +39 @@
 
 /* GUI includes: */
+#include "UILoggingDefs.h"
 #include "VBoxUtils-nix.h"
 
@@ -46 +47 @@
 #include <iprt/process.h>
 #include <iprt/string.h>
-#include <VBox/log.h>
 
 /* Other includes: */

trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/XKeyboard-new.cpp

@@ -26 +26 @@
  */
 
-/* Define GUI log group.
- * This define should go *before* VBox/log.h include: */
-#define LOG_GROUP LOG_GROUP_GUI
-
 /* Qt includes: */
 #include <QString>
 #include <QStringList>
 
-/* Other VBox includes: */
-#include <VBox/log.h>
-
 /* GUI includes: */
+#include "UILoggingDefs.h"
 #include "XKeyboard.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.cpp

@@ -26 +26 @@
  */
 
-/* Defines: */
-#define LOG_GROUP LOG_GROUP_GUI
-
 /* GUI includes: */
+#include "UILoggingDefs.h"
 #include "WinKeyboard.h"
 
 /* Other VBox includes: */
 #include <iprt/assert.h>
-#include <VBox/log.h>
 
 /* External includes: */

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

@@ -37 +37 @@
 #include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"

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

@@ -43 +43 @@
 #include "UISession.h"
 #include "UIActionPoolRuntime.h"
+#include "UILoggingDefs.h"
 #include "UIMachineLogic.h"
 #include "UIMachineWindow.h"

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

@@ -56 +56 @@
 #include "UIIconPool.h"
 #include "UIKeyboardHandler.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"

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

@@ -39 +39 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMessageCenter.h"

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

@@ -39 +39 @@
 #include "UIModalWindowManager.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMessageCenter.h"

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

@@ -38 +38 @@
 #include "UIFrameBuffer.h"
 #include "UIKeyboardHandler.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"

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

@@ -31 +31 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"

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

@@ -41 +41 @@
 #include "UIIconPool.h"
 #include "UIGuestOSType.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -34 +34 @@
 #include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogicFullscreen.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -32 +32 @@
 #ifdef VBOX_WS_MAC
 # include <QMenuBar>
-#endif /* VBOX_WS_MAC */
+#endif
 
 /* GUI includes: */
@@ -39 +39 @@
 #include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogicFullscreen.h"
@@ -44 +45 @@
 #include "UIMachineWindow.h"
 
-/* Other VBox includes: */
-#include "VBox/log.h"
-
 /* External includes: */
 #ifdef VBOX_WS_NIX
 # include <limits.h>
-#endif /* VBOX_WS_NIX */
+#endif
 
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -38 +38 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineView.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -41 +41 @@
 #include "UIInformationRuntime.h"
 #include "UIGuestProcessControlWidget.h"
+#include "UILoggingDefs.h"
 #include "UIMachineLogic.h"
 #include "UIMachine.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -37 +37 @@
 #include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogicNormal.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -38 +38 @@
 #include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"
 #include "UIMachineViewNormal.h"
 #include "UIMachineWindow.h"
-
-/* Other VBox includes: */
-#include "VBox/log.h"
 
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -44 +44 @@
 #include "UIIndicatorsPool.h"
 #include "UIKeyboardHandler.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMouseHandler.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -35 +35 @@
 #include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"
@@ -44 +45 @@
 
 /* Other VBox includes: */
-#include "VBox/log.h"
-#include <VBox/VBoxOGL.h>
+#include <VBox/VBoxOGL.h> // For VBOX_OGL_SCALE_FACTOR_MULTIPLIER
 
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -39 +39 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -34 +34 @@
 #include "UIActionPoolRuntime.h"
 #include "UICommon.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogicSeamless.h"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -38 +38 @@
 #include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogicSeamless.h"
@@ -46 +47 @@
 #include "CConsole.h"
 
-/* Other VBox includes: */
-#include "VBox/log.h"
-
 /* External includes: */
 #ifdef VBOX_WS_NIX
 # include <limits.h>
-#endif /* VBOX_WS_NIX */
-
+#endif
 
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -36 +36 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMachineLogicSeamless.h"

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp

@@ -58 +58 @@
 #include "UIIconPool.h"
 #include "UIImageTools.h"
+#include "UILoggingDefs.h"
 #include "UIMessageCenter.h"
 #include "UIModalWindowManager.h"

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPageValidator.cpp

@@ -27 +27 @@
 
 /* GUI includes: */
+#include "UILoggingDefs.h"
 #include "UISettingsPage.h"
 #include "UISettingsPageValidator.h"
-
-/* Other VBox includes: */
-#include <iprt/log.h>
 
 

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -49 +49 @@
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UIMessageCenter.h"
 #include "UIModalWindowManager.h"

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -55 +55 @@
 #include "UIHelpBrowserDialog.h"
 #include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UIMachine.h"
 #include "UIMessageCenter.h"

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -45 +45 @@
 
 /* GUI includes: */
+#include "UICommon.h"
+#include "UIAnimationFramework.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIIconPool.h"
+#include "UILoggingDefs.h"
 #include "UIMiniToolBar.h"
-#include "UIAnimationFramework.h"
-#include "UIIconPool.h"
-#include "UIDesktopWidgetWatchdog.h"
-#include "UICommon.h"
 #ifdef VBOX_WS_NIX
 # include "UIExtraDataManager.h"