Changeset 72102 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 4, 2018 8:27:54 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122494

Message:

FE/Qt: bugref:9049: Tiny cleanup for UISettingsSelector classes and move them to VBoxGlobal library.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (6 diffs)
• src/settings/UISettingsSelector.cpp (modified) (2 diffs)
• src/settings/UISettingsSelector.h (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -520 +520 @@
         src/selector/graphics/details/UIGDetailsElements.h \
         src/selector/graphics/details/UIGMachinePreview.h \
-        src/settings/UISettingsSelector.h \
         src/settings/UISettingsSerializer.h \
         src/settings/global/UIGlobalSettingsExtension.h \
@@ -664 +663 @@
         src/settings/UISettingsDialogSpecific.h \
         src/settings/UISettingsPage.h \
+        src/settings/UISettingsSelector.h \
         src/widgets/UIAddDiskEncryptionPasswordDialog.h \
         src/widgets/UIBootTable.h \
@@ -780 +780 @@
         src/settings/UISettingsDialogSpecific.h \
         src/settings/UISettingsPage.h \
+        src/settings/UISettingsSelector.h \
         src/widgets/UIAddDiskEncryptionPasswordDialog.h \
         src/widgets/UIBootTable.h \
@@ -1037 +1038 @@
         src/selector/graphics/details/UIGDetailsElements.cpp \
         src/selector/graphics/details/UIGMachinePreview.cpp \
-        src/settings/UISettingsSelector.cpp \
         src/settings/UISettingsSerializer.cpp \
         src/settings/global/UIGlobalSettingsExtension.cpp \
@@ -1222 +1222 @@
         src/settings/UISettingsDialogSpecific.cpp \
         src/settings/UISettingsPage.cpp \
+        src/settings/UISettingsSelector.cpp \
         src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
         src/widgets/UIBootTable.cpp \
@@ -1365 +1366 @@
         src/settings/UISettingsDialogSpecific.cpp \
         src/settings/UISettingsPage.cpp \
+        src/settings/UISettingsSelector.cpp \
         src/widgets/UIAddDiskEncryptionPasswordDialog.cpp \
         src/widgets/UIBootTable.cpp \

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

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

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2017 Oracle Corporation
+ * Copyright (C) 2008-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 #include <QObject>
 
+/* GUI includes: */
+#include "UILibraryDefs.h"
+
 /* Forward declarations: */
 class QAction;
@@ -29 +32 @@
 class QTreeWidgetItem;
 class QITreeWidget;
+class UISelectorActionItem;
 class UISelectorItem;
-class UISelectorActionItem;
 class UISettingsPage;
 class UIToolBar;
@@ -37 +40 @@
 /** QObject subclass providing settings dialog
   * with the means to switch between settings pages. */
-class UISettingsSelector : public QObject
+class SHARED_LIBRARY_STUFF UISettingsSelector : public QObject
 {
     Q_OBJECT;
@@ -51 +54 @@
     UISettingsSelector(QWidget *pParent = 0);
     /** Destructs settings selector. */
-    ~UISettingsSelector();
+    virtual ~UISettingsSelector() /* override */;
 
     /** Returns the widget selector operates on. */
@@ -124 +127 @@
   * with the means to switch between settings pages.
   * This one represented as tree-widget. */
-class UISettingsSelectorTreeView : public UISettingsSelector
+class SHARED_LIBRARY_STUFF UISettingsSelectorTreeView : public UISettingsSelector
 {
     Q_OBJECT;
@@ -133 +136 @@
     UISettingsSelectorTreeView(QWidget *pParent = 0);
     /** Destructs settings selector. */
-    ~UISettingsSelectorTreeView();
+    virtual ~UISettingsSelectorTreeView() /* override */;
 
     /** Returns the widget selector operates on. */
@@ -197 +200 @@
   * with the means to switch between settings pages.
   * This one represented as tab-widget. */
-class UISettingsSelectorToolBar : public UISettingsSelector
+class SHARED_LIBRARY_STUFF UISettingsSelectorToolBar : public UISettingsSelector
 {
     Q_OBJECT;
@@ -206 +209 @@
     UISettingsSelectorToolBar(QWidget *pParent = 0);
     /** Destructs settings selector. */
-    ~UISettingsSelectorToolBar();
+    virtual ~UISettingsSelectorToolBar() /* override */;
 
     /** Returns the widget selector operates on. */
@@ -275 +278 @@
 };
 
+
 #endif /* !___UISettingsSelector_h___ */
-