Changeset 90936 in vbox

Timestamp:

Aug 27, 2021 8:27:50 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UICommon includes cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (5 diffs)
• UICommon.h (modified) (2 diffs)

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

@@ -53 +53 @@
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
+#include "QIFileDialog.h"
+#include "QIMessageBox.h"
 #include "QIWithRestorableGeometry.h"
 #include "UICommon.h"
-#include "VBoxLicenseViewer.h"
-#include "UIMessageCenter.h"
-#include "UIPopupCenter.h"
-#include "QIMessageBox.h"
-#include "QIDialogButtonBox.h"
+#include "UIConverter.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
 #include "UIFDCreationDialog.h"
 #include "UIIconPool.h"
+#include "UIMedium.h"
+#include "UIMediumEnumerator.h"
+#include "UIMediumSelector.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
 #include "UINotificationCenter.h"
+#include "UIPopupCenter.h"
+#include "UIShortcutPool.h"
 #include "UIThreadPool.h"
-#include "UIShortcutPool.h"
-#include "UIExtraDataManager.h"
-#include "QIFileDialog.h"
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-# include "UINetworkRequestManager.h"
-# include "UIUpdateManager.h"
-#endif
-#include "UIConverter.h"
-#include "UIMediumEnumerator.h"
-#include "UIMedium.h"
-#include "UIMediumSelector.h"
-#include "UIModalWindowManager.h"
-#include "UIIconPool.h"
+#include "UIVirtualBoxClientEventHandler.h"
 #include "UIVirtualBoxEventHandler.h"
-#include "UIVirtualBoxClientEventHandler.h"
-#include "UIDesktopWidgetWatchdog.h"
 #include "UIVisoCreator.h"
 #include "UIWizardNewVD.h"
+#include "VBoxLicenseViewer.h"
 #ifdef VBOX_WS_MAC
-# include "VBoxUtils-darwin.h"
 # include "UIMachineWindowFullscreen.h"
 # include "UIMachineWindowSeamless.h"
+# include "VBoxUtils-darwin.h"
 #endif
 #ifdef VBOX_WS_X11
 # include "UIHostComboEditor.h"
 # include "VBoxX11Helper.h"
+#endif
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkRequestManager.h"
+# include "UIUpdateManager.h"
 #endif
 
@@ -119 +118 @@
 #include <iprt/asm.h>
 #include <iprt/ctype.h>
+#include <iprt/env.h>
 #include <iprt/err.h>
-#include <iprt/env.h>
 #include <iprt/file.h>
 #include <iprt/getopt.h>
@@ -126 +125 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/stream.h>
 #include <iprt/system.h>
-#include <iprt/stream.h>
 #ifdef VBOX_WS_X11
 # include <iprt/mem.h>
@@ -148 +147 @@
 
 /* External includes: */
-# include <math.h>
+#include <math.h>
 #ifdef VBOX_WS_MAC
 # include <sys/utsname.h>
@@ -166 +165 @@
 # define BOOL PRBool
 #endif
-
-//#define VBOX_WITH_FULL_DETAILS_REPORT /* hidden for now */
 
 /* Namespaces: */

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

@@ -36 +36 @@
 
 /* COM includes: */
-#include "VBox/com/Guid.h"
 #include "CGuestOSType.h"
 #include "CHost.h"
 #include "CMedium.h"
 #include "CSession.h"
+#include "CVirtualBox.h"
 #include "CVirtualBoxClient.h"
-#include "CVirtualBox.h"
+
+/* Other VBox includes: */
+#include "VBox/com/Guid.h"
 
 /* Other includes: */
@@ -59 +61 @@
 class CMachine;
 class CUSBDevice;
+class UIIconPoolGeneral;
 class UIMedium;
 class UIMediumEnumerator;
-class UIIconPoolGeneral;
 class UIThreadPool;