Changeset 71923 in vbox for trunk/src/VBox

Timestamp:

Apr 19, 2018 1:22:46 PM (7 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (6 diffs)
• src/widgets/UIMenuBar.cpp (modified) (4 diffs)
• src/widgets/UIMenuBar.h (modified) (3 diffs)

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

@@ -558 +558 @@
         src/widgets/UIEmptyFilePathSelector.h \
         src/widgets/UILineTextEdit.h \
-        src/widgets/UIMenuBar.h \
         src/widgets/UIPortForwardingTable.h \
         src/widgets/UISlidingWidget.h \
@@ -686 +685 @@
         src/widgets/UIHotKeyEditor.h \
         src/widgets/UIMediumSizeEditor.h \
+        src/widgets/UIMenuBar.h \
         src/widgets/UIPopupBox.h \
         src/widgets/UIPopupPane.h \
@@ -779 +779 @@
         src/widgets/UIHotKeyEditor.h \
         src/widgets/UIMediumSizeEditor.h \
+        src/widgets/UIMenuBar.h \
         src/widgets/UIPopupBox.h \
         src/widgets/UIPopupPane.h \
@@ -1049 +1050 @@
         src/widgets/UIEmptyFilePathSelector.cpp \
         src/widgets/UILineTextEdit.cpp \
-        src/widgets/UIMenuBar.cpp \
         src/widgets/UIPortForwardingTable.cpp \
         src/widgets/UISlidingWidget.cpp \
@@ -1217 +1217 @@
         src/widgets/UIHotKeyEditor.cpp \
         src/widgets/UIMediumSizeEditor.cpp \
+        src/widgets/UIMenuBar.cpp \
         src/widgets/UIPopupBox.cpp \
         src/widgets/UIPopupPane.cpp \
@@ -1336 +1337 @@
         src/widgets/UIHotKeyEditor.cpp \
         src/widgets/UIMediumSizeEditor.cpp \
+        src/widgets/UIMenuBar.cpp \
         src/widgets/UIPopupBox.cpp \
         src/widgets/UIPopupPane.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBar.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 
 /* GUI includes: */
+# include "VBoxGlobal.h"
+# include "UIImageTools.h"
 # include "UIMenuBar.h"
-# include "UIImageTools.h"
-# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -44 +44 @@
 void UIMenuBar::paintEvent(QPaintEvent *pEvent)
 {
+    /* Call to base-class: */
     QMenuBar::paintEvent(pEvent);
+
+    /* Draw BETA label if necessary: */
     if (m_fShowBetaLabel)
     {
@@ -60 +63 @@
     }
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBar.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 #include <QMenuBar>
 
+/* GUI includes: */
+#include "UILibraryDefs.h"
+
+/* Forward declarations: */
+class QPaintEvent;
+class QWidget;
+
 /** QMenuBar extension
   * which reflects BETA label when necessary. */
-class UIMenuBar: public QMenuBar
+class SHARED_LIBRARY_STUFF UIMenuBar: public QMenuBar
 {
     Q_OBJECT;
@@ -36 +43 @@
 
     /** Paint event handler. */
-    void paintEvent(QPaintEvent *pEvent);
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
 
 private: