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

Timestamp:

Sep 25, 2015 12:54:20 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Window menu Manager cleanup/rework (step 3): Reordering.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin

Files:

• UIWindowMenuManager.cpp (modified) (2 diffs)
• UIWindowMenuManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp

@@ -207 +207 @@
 }
 
+UIWindowMenuManager::UIWindowMenuManager()
+{
+    /* Assign instance: */
+    m_spInstance = this;
+
+    /* Install global event-filter: */
+    qApp->installEventFilter(this);
+}
+
+UIWindowMenuManager::~UIWindowMenuManager()
+{
+    /* Cleanup all helpers: */
+    qDeleteAll(m_helpers);
+
+    /* Unassign instance: */
+    m_spInstance = 0;
+}
+
 QMenu *UIWindowMenuManager::createMenu(QWidget *pWindow)
 {
@@ -315 +333 @@
 }
 
-UIWindowMenuManager::UIWindowMenuManager()
-{
-    /* Assign instance: */
-    m_spInstance = this;
-
-    /* Install global event-filter: */
-    qApp->installEventFilter(this);
-}
-
-UIWindowMenuManager::~UIWindowMenuManager()
-{
-    /* Cleanup all helpers: */
-    qDeleteAll(m_helpers);
-
-    /* Unassign instance: */
-    m_spInstance = 0;
-}
-
 #include "UIWindowMenuManager.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.h

@@ -39 +39 @@
 
     /** Static constructor and instance provider. */
-    static UIWindowMenuManager *instance();
+    static UIWindowMenuManager* instance();
     /** Static destructor. */
     static void destroy();
@@ -58 +58 @@
 protected:
 
-    /** Preprocesses any Qt @a pEvent for passed @a pObject. */
-    bool eventFilter(QObject *pObject, QEvent *pEvent);
-
-private:
-
     /** Constructs 'Window' menu Manager. */
     UIWindowMenuManager();
     /** Destructs 'Window' menu Manager. */
     ~UIWindowMenuManager();
+
+    /** Preprocesses any Qt @a pEvent for passed @a pObject. */
+    virtual bool eventFilter(QObject *pObject, QEvent *pEvent);
+
+private:
 
     /** Holds the static instance. */