Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 71616)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 71617)
@@ -457,9 +457,18 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Application; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuType_Application;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Application); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Application);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Application); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Application);
+    }
 
     /** Handles translation event. */
@@ -492,12 +501,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_Close; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuApplicationActionType_Close;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_Close); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_Close);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Close); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Close);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Close");
@@ -505,5 +523,5 @@
 
     /** Returns default shortcut. */
-    QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const
+    virtual QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const /* override */
     {
         switch (actionPoolType)
@@ -539,9 +557,18 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Window; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuType_Window;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Window); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Window);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Window); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Window);
+    }
 
     /** Handles translation event. */
@@ -568,12 +595,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuWindowActionType_Minimize; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuWindowActionType_Minimize;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuWindowActionType_Minimize); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuWindowActionType_Minimize);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType_Minimize); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuWindow(UIExtraDataMetaDefs::MenuWindowActionType_Minimize);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Minimize");
@@ -607,9 +643,18 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuType_Help; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuType_Help;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Help); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuType_Help);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Help); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuBar(UIExtraDataMetaDefs::MenuType_Help);
+    }
 
     /** Handles translation event. */
@@ -638,12 +683,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_Contents; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuHelpActionType_Contents;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Contents); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Contents);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Contents); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Contents);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Help");
@@ -651,5 +705,5 @@
 
     /** Returns default shortcut. */
-    QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const
+    virtual QKeySequence defaultShortcut(UIActionPoolType actionPoolType) const /* override */
     {
         switch (actionPoolType)
@@ -687,12 +741,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_WebSite; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuHelpActionType_WebSite;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_WebSite); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_WebSite);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_WebSite); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_WebSite);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Web");
@@ -725,12 +788,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_BugTracker; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuHelpActionType_BugTracker;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_BugTracker); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_BugTracker);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_BugTracker); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_BugTracker);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("BugTracker");
@@ -763,12 +835,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_Forums; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuHelpActionType_Forums;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Forums); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Forums);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Forums); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Forums);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Forums");
@@ -801,12 +882,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuHelpActionType_Oracle; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuHelpActionType_Oracle;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Oracle); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuHelpActionType_Oracle);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Oracle); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuHelp(UIExtraDataMetaDefs::MenuHelpActionType_Oracle);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Oracle");
@@ -840,12 +930,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_ResetWarnings);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("ResetWarnings");
@@ -880,12 +979,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_NetworkAccessManager);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("NetworkAccessManager");
@@ -919,12 +1027,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_CheckForUpdates);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Update");
@@ -959,5 +1076,5 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const
+    virtual int extraDataID() const /* override */
     {
 #ifdef VBOX_WS_MAC
@@ -968,5 +1085,5 @@
     }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const
+    virtual QString extraDataKey() const /* override */
     {
 #ifdef VBOX_WS_MAC
@@ -977,5 +1094,5 @@
     }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const
+    virtual bool isAllowed() const /* override */
     {
 #ifdef VBOX_WS_MAC
@@ -987,5 +1104,5 @@
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("About");
@@ -1019,12 +1136,21 @@
 
     /** Returns action extra-data ID. */
-    virtual int extraDataID() const { return UIExtraDataMetaDefs::MenuApplicationActionType_Preferences; }
+    virtual int extraDataID() const /* override */
+    {
+        return UIExtraDataMetaDefs::MenuApplicationActionType_Preferences;
+    }
     /** Returns action extra-data key. */
-    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences); }
+    virtual QString extraDataKey() const /* override */
+    {
+        return gpConverter->toInternalString(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences);
+    }
     /** Returns whether action is allowed. */
-    virtual bool isAllowed() const { return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences); }
+    virtual bool isAllowed() const /* override */
+    {
+        return actionPool()->isAllowedInMenuApplication(UIExtraDataMetaDefs::MenuApplicationActionType_Preferences);
+    }
 
     /** Returns shortcut extra-data ID. */
-    QString shortcutExtraDataID() const
+    virtual QString shortcutExtraDataID() const /* override */
     {
         return QString("Preferences");
@@ -1032,5 +1158,5 @@
 
     /** Returns default shortcut. */
-    QKeySequence defaultShortcut(UIActionPoolType) const
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
     {
         switch (actionPool()->type())
@@ -1598,4 +1724,5 @@
 }
 
+
 #include "UIActionPool.moc"