Changeset 89296 in vbox

Timestamp:

May 26, 2021 3:25:19 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10003: A bit of cleanup for UICommon code; Just includes reordering.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp (modified) (9 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
 #include <QFileDialog>
 #include <QGraphicsWidget>
+#include <QLibraryInfo>
 #include <QLocale>
 #include <QMenu>
@@ -26 +27 @@
 #include <QPainter>
 #include <QProcess>
+#include <QProgressDialog>
+#include <QSessionManager>
+#include <QSettings>
 #include <QSpinBox>
 #include <QStandardPaths>
+#include <QStyleOptionSpinBox>
 #include <QThread>
 #include <QTimer>
@@ -33 +38 @@
 #include <QToolTip>
 #include <QTranslator>
-#include <QLibraryInfo>
-#include <QProgressDialog>
-#include <QSettings>
-#include <QStyleOptionSpinBox>
-#include <QSessionManager>
 #ifdef VBOX_WS_WIN
 # include <QEventLoop>
-#endif /* VBOX_WS_WIN */
+#endif
 #ifdef VBOX_WS_X11
+# include <QScreen>
 # include <QScrollBar>
 # include <QTextBrowser>
 # include <QX11Info>
-#endif /* VBOX_WS_X11 */
+#endif
 #ifdef VBOX_GUI_WITH_PIDFILE
 # include <QTextStream>
-#endif /* VBOX_GUI_WITH_PIDFILE */
-#ifdef VBOX_WS_X11
-# include <QScreen>
 #endif
 
@@ -70 +68 @@
 # include "UINetworkRequestManager.h"
 # include "UIUpdateManager.h"
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+#endif
 #include "UIConverter.h"
 #include "UIMediumEnumerator.h"
@@ -82 +80 @@
 #include "UIVisoCreator.h"
 #include "UIWizardNewVD.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+# include "UIMachineWindowFullscreen.h"
+# include "UIMachineWindowSeamless.h"
+#endif
 #ifdef VBOX_WS_X11
 # include "UIHostComboEditor.h"
 # include "VBoxX11Helper.h"
 #endif
-#ifdef VBOX_WS_MAC
-# include "VBoxUtils-darwin.h"
-# include "UIMachineWindowFullscreen.h"
-# include "UIMachineWindowSeamless.h"
-#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
@@ -130 +128 @@
 #ifdef VBOX_WS_X11
 # include <iprt/mem.h>
-#endif /* VBOX_WS_X11 */
+#endif
 #include <VBox/sup.h>
 #include <VBox/VBoxOGL.h>
@@ -151 +149 @@
 #ifdef VBOX_WS_MAC
 # include <sys/utsname.h>
-#endif /* VBOX_WS_MAC */
+#endif
 #ifdef VBOX_WS_X11
 // WORKAROUND:
@@ -165 +163 @@
 # include <X11/extensions/Xinerama.h>
 # define BOOL PRBool
-#endif /* VBOX_WS_X11 */
+#endif
 
 //#define VBOX_WITH_FULL_DETAILS_REPORT /* hidden for now */