Changeset 94005 in vbox

Timestamp:

Mar 1, 2022 12:58:47 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: QMap::insertMulti -> QMultiMap::insert (5.5?). bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• settings/editors/UIShortcutConfigurationEditor.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsSF.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -257 +257 @@
 
 /* Obsolete keys: */
-QMap<QString, QString> UIExtraDataDefs::prepareObsoleteKeysMap()
+QMultiMap<QString, QString> UIExtraDataDefs::prepareObsoleteKeysMap()
 {
-    QMap<QString, QString> map;
-    map.insertMulti(GUI_Details_Elements, GUI_DetailsPageBoxes);
-    map.insertMulti(GUI_Details_Elements_Preview_UpdateInterval, GUI_PreviewUpdate);
+    QMultiMap<QString, QString> map;
+    map.insert(GUI_Details_Elements, GUI_DetailsPageBoxes);
+    map.insert(GUI_Details_Elements_Preview_UpdateInterval, GUI_PreviewUpdate);
     return map;
 }
-QMap<QString, QString> UIExtraDataDefs::g_mapOfObsoleteKeys = UIExtraDataDefs::prepareObsoleteKeysMap();
+QMultiMap<QString, QString> UIExtraDataDefs::g_mapOfObsoleteKeys = UIExtraDataDefs::prepareObsoleteKeysMap();
 
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -470 +470 @@
       * @{ */
         /** Prepares obsolete keys map. */
-        SHARED_LIBRARY_STUFF QMap<QString, QString> prepareObsoleteKeysMap();
+        SHARED_LIBRARY_STUFF QMultiMap<QString, QString> prepareObsoleteKeysMap();
 
         /** Holds the obsolete keys map. */
-        SHARED_LIBRARY_STUFF extern QMap<QString, QString> g_mapOfObsoleteKeys;
+        SHARED_LIBRARY_STUFF extern QMultiMap<QString, QString> g_mapOfObsoleteKeys;
     /** @} */
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp

@@ -405 +405 @@
 {
     /* Enumerate all the sequences: */
-    QMap<QString, QString> usedSequences;
+    QMultiMap<QString, QString> usedSequences;
     foreach (const UIShortcutTableViewRow &item, m_shortcuts)
     {
@@ -413 +413 @@
             const QString strScope = item.scope();
             strKey = strScope.isNull() ? strKey : QString("%1: %2").arg(strScope, strKey);
-            usedSequences.insertMulti(strKey, item.key());
+            usedSequences.insert(strKey, item.key());
         }
     }
@@ -420 +420 @@
     foreach (const QString &strKey, usedSequences.keys())
         if (usedSequences.count(strKey) > 1)
-            duplicatedSequences.unite(usedSequences.values(strKey).toSet());
+        {
+            foreach (const QString &strValue, usedSequences.values(strKey))
+                duplicatedSequences |= strValue;
+        }
     /* Is there something changed? */
     if (m_duplicatedSequences != duplicatedSequences)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -335 +335 @@
 
     /* Get actual folders: */
-    QMap<UISharedFolderType, CSharedFolder> folders;
+    QMultiMap<UISharedFolderType, CSharedFolder> folders;
     /* Load machine (permanent) folders if allowed: */
     if (isSharedFolderTypeSupported(MachineType))
     {
         foreach (const CSharedFolder &folder, getSharedFolders(MachineType))
-            folders.insertMulti(MachineType, folder);
+            folders.insert(MachineType, folder);
     }
     /* Load console (temporary) folders if allowed: */
@@ -346 +346 @@
     {
         foreach (const CSharedFolder &folder, getSharedFolders(ConsoleType))
-            folders.insertMulti(ConsoleType, folder);
+            folders.insert(ConsoleType, folder);
     }