Changeset 71895 in vbox for trunk

Timestamp:

Apr 18, 2018 1:08:11 PM (7 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (7 diffs)
• src/extensions/QIMenu.cpp (modified) (3 diffs)
• src/extensions/QIMenu.h (modified) (3 diffs)

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

@@ -440 +440 @@
 VirtualBox_QT_MOCHDRS = \
         src/UITakeSnapshotDialog.h \
-        src/extensions/QIMenu.h \
         src/extensions/QIStatusBar.h \
         src/extensions/graphics/QIGraphicsView.h \
@@ -655 +654 @@
         src/extensions/QIMainWindow.h \
         src/extensions/QIManagerDialog.h \
+        src/extensions/QIMenu.h \
         src/extensions/QIMessageBox.h \
         src/extensions/QIProcess.h \
@@ -739 +739 @@
         src/extensions/QIMainWindow.h \
         src/extensions/QIManagerDialog.h \
+        src/extensions/QIMenu.h \
         src/extensions/QIMessageBox.h \
         src/extensions/QIProcess.h \
@@ -916 +917 @@
         src/main.cpp \
         src/UITakeSnapshotDialog.cpp \
-        src/extensions/QIMenu.cpp \
         src/extensions/QIStatusBar.cpp \
         src/extensions/graphics/QIGraphicsView.cpp \
@@ -1165 +1165 @@
         src/extensions/QIMainWindow.cpp \
         src/extensions/QIManagerDialog.cpp \
+        src/extensions/QIMenu.cpp \
         src/extensions/QIMessageBox.cpp \
         src/extensions/QIProcess.cpp \
@@ -1250 +1251 @@
         src/platform/darwin/VBoxUtils-darwin-cocoa.mm \
         src/platform/darwin/VBoxUtils-darwin.cpp
-
 endif
 
@@ -1276 +1276 @@
         src/extensions/QIMainWindow.cpp \
         src/extensions/QIManagerDialog.cpp \
+        src/extensions/QIMenu.cpp \
         src/extensions/QIMessageBox.cpp \
         src/extensions/QIProcess.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIMenu class implementation.
+ * VBox Qt GUI - Qt extensions: QIMenu class implementation.
  */
 
 /*
- * Copyright (C) 2010-2017 Oracle Corporation
+ * Copyright (C) 2010-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
 # include <precomp.h>
 #else
+
 /* GUI includes: */
 # include "QIMenu.h"
+
 #endif
 
@@ -34 +36 @@
     /* Windows host requires window-activation: */
     activateWindow();
-#endif /* VBOX_WS_WIN */
+#endif
+
     /* Focus next child: */
     QMenu::focusNextChild();
 }
-

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIMenu class declaration.
+ * VBox Qt GUI - Qt extensions: QIMenu class declaration.
  */
 
 /*
- * 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 <QMenu>
 
-/** QMenu extension
-  * which allows to highlight first menu item for popped up menu. */
+/* GUI includes: */
+#include "UILibraryDefs.h"
+
+/** QMenu extension with advanced functionality.
+  * Allows to highlight first menu item for popped up menu. */
 class QIMenu : public QMenu
 {
@@ -30 +33 @@
 public:
 
-    /** Constructor, passes @a pParent to the QMenu constructor. */
+    /** Constructs menu passing @a pParent to the base-class. */
     QIMenu(QWidget *pParent = 0);