Changeset 44584 in vbox

Timestamp:

Feb 7, 2013 1:33:21 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6065: Some shortcut-pool cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIShortcutPool.cpp (modified) (8 diffs)
• UIShortcutPool.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp

@@ -85 +85 @@
 {
     /* Compose shortcut key: */
-    QString strShortcutKey(m_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
-                                                        pAction->shortcutExtraDataID()));
+    const QString strShortcutKey(m_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
+                                                              pAction->shortcutExtraDataID()));
     /* Return existing if any: */
     if (m_shortcuts.contains(strShortcutKey))
@@ -112 +112 @@
             continue;
 
-        /* Compose full shortcut key: */
-        QString strShortcutKey = m_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
-                                                              pAction->shortcutExtraDataID());
+        /* Compose shortcut key: */
+        const QString strShortcutKey = m_strShortcutKeyTemplate.arg(pActionPool->shortcutsExtraDataID(),
+                                                                    pAction->shortcutExtraDataID());
         /* If shortcut key is already known: */
         if (m_shortcuts.contains(strShortcutKey))
@@ -120 +120 @@
             /* Get corresponding shortcut: */
             UIShortcut &existingShortcut = m_shortcuts[strShortcutKey];
+            /* Copy the description from the action to the shortcut: */
+            existingShortcut.setDescription(pAction->name());
             /* Copy the sequence from the shortcut to the action: */
             pAction->setShortcut(existingShortcut.sequence());
-            /* Copy the description from the action to the shortcut if necessary: */
-            if (existingShortcut.description().isNull())
-                existingShortcut.setDescription(pAction->name());
         }
         /* If shortcut key is NOT known yet: */
@@ -143 +142 @@
 {
     /* Clear selector shortcuts first: */
-    QList<QString> shortcutKeyList = m_shortcuts.keys();
+    const QList<QString> shortcutKeyList = m_shortcuts.keys();
     foreach (const QString &strShortcutKey, shortcutKeyList)
         if (strShortcutKey.startsWith(GUI_Input_SelectorShortcuts))
@@ -156 +155 @@
 {
     /* Clear machine shortcuts first: */
-    QList<QString> shortcutKeyList = m_shortcuts.keys();
+    const QList<QString> shortcutKeyList = m_shortcuts.keys();
     foreach (const QString &strShortcutKey, shortcutKeyList)
         if (strShortcutKey.startsWith(GUI_Input_MachineShortcuts))
@@ -200 +199 @@
 {
     /* Runtime shortcut key template: */
-    QString strRuntimeShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(GUI_Input_MachineShortcuts));
+    const QString strRuntimeShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(GUI_Input_MachineShortcuts));
     /* Default shortcut for the Runtime Popup Menu invokation: */
     m_shortcuts.insert(strRuntimeShortcutKeyTemplate.arg("PopupMenu"),
@@ -214 +213 @@
 }
 
-void UIShortcutPool::loadOverridesFor(const QString &strExtraDataID)
-{
-    /* Shortcut prefix: */
-    QString strShortcutPrefix(strExtraDataID);
-    /* Shortcut key template: */
-    QString strShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(strShortcutPrefix));
-    /* Iterate over all the records: */
-    parseOverrides(vboxGlobal().virtualBox().GetExtraDataStringList(strShortcutPrefix), strShortcutKeyTemplate);
-}
-
-void UIShortcutPool::parseOverrides(const QStringList &overrides, const QString &strTemplate)
-{
-    /* Iterate over all the selector records: */
+void UIShortcutPool::loadOverridesFor(const QString &strPoolExtraDataID)
+{
+    /* Compose shortcut key template: */
+    const QString strShortcutKeyTemplate(m_strShortcutKeyTemplate.arg(strPoolExtraDataID));
+    /* Iterate over all the overrides: */
+    const QStringList overrides = vboxGlobal().virtualBox().GetExtraDataStringList(strPoolExtraDataID);
     foreach (const QString &strKeyValuePair, overrides)
     {
-        /* Make sure record structure is valid: */
+        /* Make sure override structure is valid: */
         int iDelimiterPosition = strKeyValuePair.indexOf('=');
         if (iDelimiterPosition < 0)
             continue;
 
-        /* Get shortcut ID/value: */
-        QString strShortcutID = strKeyValuePair.left(iDelimiterPosition);
-        QString strShortcutValue = strKeyValuePair.right(strKeyValuePair.length() - iDelimiterPosition - 1);
+        /* Get shortcut ID/sequence: */
+        const QString strShortcutExtraDataID = strKeyValuePair.left(iDelimiterPosition);
+        const QString strShortcutSequence = strKeyValuePair.right(strKeyValuePair.length() - iDelimiterPosition - 1);
 
         /* Compose corresponding shortcut key: */
-        QString strShortcutKey(strTemplate.arg(strShortcutID));
+        const QString strShortcutKey(strShortcutKeyTemplate.arg(strShortcutExtraDataID));
         /* Modify map with composed key/value: */
         if (!m_shortcuts.contains(strShortcutKey))
-            m_shortcuts.insert(strShortcutKey, UIShortcut(QString(), strShortcutValue));
+            m_shortcuts.insert(strShortcutKey, UIShortcut(QString(), strShortcutSequence));
         else
         {
@@ -248 +240 @@
             UIShortcut &shortcut = m_shortcuts[strShortcutKey];
             /* Check if corresponding shortcut overriden by value: */
-            if (shortcut.toString().compare(strShortcutValue, Qt::CaseInsensitive) != 0)
+            if (shortcut.toString().compare(strShortcutSequence, Qt::CaseInsensitive) != 0)
             {
                 /* Shortcut unassigned? */
-                if (strShortcutValue.compare("None", Qt::CaseInsensitive) == 0)
+                if (strShortcutSequence.compare("None", Qt::CaseInsensitive) == 0)
                     shortcut.setSequence(QKeySequence());
                 /* Or reassigned? */
                 else
-                    shortcut.setSequence(QKeySequence(strShortcutValue));
+                    shortcut.setSequence(QKeySequence(strShortcutSequence));
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.h

@@ -107 +107 @@
     void loadOverrides();
     void loadOverridesFor(const QString &strExtraDataID);
-    void parseOverrides(const QStringList &overrides, const QString &strTemplate);
 
     /* Helper: Shortcut stuff: */