Changeset 71428 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 21, 2018 1:01:35 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Full and heavy cleanup for UIDefs.

Location:

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

Files:

• UIDefs.cpp (modified) (1 diff)
• UIDefs.h (modified) (8 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 #include "COMEnums.h"
 
+/* Define GUI log group: */
+// WORKAROUND:
+// This define should go *before* VBox/log.h include!
 #ifndef VBOX_WITH_PRECOMPILED_HEADERS
-/* Define GUI log group.
- * This define should go *before* VBox/log.h include: */
-#define LOG_GROUP LOG_GROUP_GUI
+# define LOG_GROUP LOG_GROUP_GUI
 #endif
+
 /* Other VBox includes: */
 #include <VBox/log.h>
@@ -44 +46 @@
 # define AssertWrapperOk(w)          do {} while (0)
 # define AssertWrapperOkMsg(w, m)    do {} while (0)
-#endif /* DEBUG */
+#endif /* !DEBUG */
 
 #ifndef SIZEOF_ARRAY
 # define SIZEOF_ARRAY(a) (sizeof(a) / sizeof(a[0]))
-#endif /* SIZEOF_ARRAY */
+#endif
+
 
 /** Global namespace. */
 namespace UIDefs
 {
-    /* Additional Qt event types: */
+    /** Additional Qt event types. */
     enum UIEventType
     {
-          ResizeEventType = QEvent::User + 101
-        , SetRegionEventType
-        , ModifierKeyChangeEventType
-#ifdef VBOX_WS_WIN
-        , ShellExecuteEventType
-#endif /* VBOX_WS_WIN */
-        , ActivateActionEventType
+        ActivateActionEventType = QEvent::User + 101,
 #ifdef VBOX_WS_MAC
-        , ShowWindowEventType
-#endif /* VBOX_WS_MAC */
-        , AddVDMUrlsEventType
+        ShowWindowEventType,
+#endif
 #ifdef VBOX_GUI_USE_QGL
-        , VHWACommandProcessType
-#endif /* VBOX_GUI_USE_QGL */
+        VHWACommandProcessType,
+#endif
     };
 
-    /* Size formatting types: */
+    /** Size formatting types. */
     enum FormatSize
     {
@@ -80 +76 @@
     };
 
-    /* File name declarations: */
+    /** Default guest additions image name. */
     extern const char* GUI_GuestAdditionsName;
+    /** Default extension pack name. */
     extern const char* GUI_ExtPackName;
 
-    /* File extensions declarations: */
+    /** Allowed VBox file extensions. */
     extern QStringList VBoxFileExts;
+    /** Allowed VBox Extension Pack file extensions. */
     extern QStringList VBoxExtPackFileExts;
+    /** Allowed OVF file extensions. */
     extern QStringList OVFFileExts;
+    /** Allowed OPC file extensions. */
     extern QStringList OPCFileExts;
 }
 using namespace UIDefs /* if header included */;
 
+
 #ifdef VBOX_WS_MAC
-/** Mac OS X: Known OS releases. */
+/** Known macOS releases. */
 enum MacOSXRelease
 {
@@ -107 +108 @@
 #endif /* VBOX_WS_MAC */
 
-/** Common UI: Size suffixes. */
+
+/** Size suffixes. */
 enum SizeSuffix
 {
@@ -119 +121 @@
 };
 
-/** Common UI: Storage-slot struct. */
+
+/** Storage-slot struct. */
 struct StorageSlot
 {
@@ -139 +142 @@
 Q_DECLARE_METATYPE(StorageSlot);
 
-/** Common UI: Storage-slot struct extension with exact controller name. */
+
+/** Storage-slot struct extension with exact controller name. */
 struct ExactStorageSlot : public StorageSlot
 {
@@ -150 +154 @@
 };
 
+
 #endif /* !___UIDefs_h___ */
+