Changeset 71871 in vbox for trunk/src/VBox

Timestamp:

Apr 17, 2018 11:58:18 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Tiny cleanup for QIManagerDialog and move it to VBoxGlobal library.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (6 diffs)
• src/extensions/QIManagerDialog.cpp (modified) (2 diffs)
• src/extensions/QIManagerDialog.h (modified) (7 diffs)

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

@@ -441 +441 @@
         src/UITakeSnapshotDialog.h \
         src/extensions/QIFlowLayout.h \
-        src/extensions/QIManagerDialog.h \
         src/extensions/QIMenu.h \
         src/extensions/QIStatusBar.h \
@@ -660 +659 @@
         src/extensions/QIMainDialog.h \
         src/extensions/QIMainWindow.h \
+        src/extensions/QIManagerDialog.h \
         src/extensions/QIMessageBox.h \
         src/extensions/QIProcess.h \
@@ -737 +737 @@
         src/extensions/QIMainDialog.h \
         src/extensions/QIMainWindow.h \
+        src/extensions/QIManagerDialog.h \
         src/extensions/QIMessageBox.h \
         src/extensions/QIProcess.h \
@@ -910 +911 @@
         src/UITakeSnapshotDialog.cpp \
         src/extensions/QIFlowLayout.cpp \
-        src/extensions/QIManagerDialog.cpp \
         src/extensions/QIMenu.cpp \
         src/extensions/QIStatusBar.cpp \
@@ -1161 +1161 @@
         src/extensions/QIMainDialog.cpp \
         src/extensions/QIMainWindow.cpp \
+        src/extensions/QIManagerDialog.cpp \
         src/extensions/QIMessageBox.cpp \
         src/extensions/QIProcess.cpp \
@@ -1265 +1266 @@
         src/extensions/QIMainDialog.cpp \
         src/extensions/QIMainWindow.cpp \
+        src/extensions/QIManagerDialog.cpp \
         src/extensions/QIMessageBox.cpp \
         src/extensions/QIProcess.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIManagerDialog class implementation.
+ * VBox Qt GUI - Qt extensions: QIManagerDialog class implementation.
  */
 
 /*
- * Copyright (C) 2009-2017 Oracle Corporation
+ * Copyright (C) 2009-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29 +29 @@
 # include "QIDialogButtonBox.h"
 # include "QIManagerDialog.h"
+# include "VBoxGlobal.h"
 # include "UIDesktopWidgetWatchdog.h"
 # ifdef VBOX_WS_MAC
 #  include "UIToolBar.h"
 #  include "UIWindowMenuManager.h"
-# endif /* VBOX_WS_MAC */
-# include "VBoxGlobal.h"
+# endif
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIManagerDialog class declaration.
+ * VBox Qt GUI - Qt extensions: QIManagerDialog class declaration.
  */
 
 /*
- * Copyright (C) 2009-2017 Oracle Corporation
+ * Copyright (C) 2009-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include <QMap>
 
+/* GUI includes: */
+#include "UILibraryDefs.h"
+
 /* Other VBox includes: */
 #include <iprt/cdefs.h>
@@ -54 +57 @@
 
 /** Manager dialog factory insterface. */
-class QIManagerDialogFactory
+class SHARED_LIBRARY_STUFF QIManagerDialogFactory
 {
 public:
@@ -78 +81 @@
 
 /** QMainWindow sub-class used as various manager dialogs. */
-class QIManagerDialog : public QMainWindow
+class SHARED_LIBRARY_STUFF QIManagerDialog : public QMainWindow
 {
     Q_OBJECT;
@@ -127 +130 @@
         virtual void loadSettings() {}
 
+        /** Saves dialog setting into extradata. */
+        virtual void saveSettings() const {}
         /** Cleanup menu-bar.
           * @note Injected into cleanup(), normally you don't need to reimplement it. */
@@ -133 +138 @@
           * @note Normally you don't need to reimplement it. */
         void cleanup();
-        /** Saves dialog setting such as geometry into extradata. */
-        virtual void saveSettings() const {}
-
     /** @} */
 
@@ -210 +212 @@
 };
 
+
 #endif /* !___QIManagerDialog_h___ */
-