Changeset 94029 in vbox

Timestamp:

Mar 1, 2022 11:09:14 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150262

Message:

FE/Qt: qt6: QList, QSet & QVector adjustments. bugref:9898

• QList::toSet was removed in "favor" of QSet's range constructors (5.14+). Similarly QSet::fromList. Very tedious and there were some unnecessary QSet conversions.
• QVector was mapped to QList and fromStdVector discontinued in 6.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (1 diff)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (2 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)
• runtime/UIKeyboardHandler.cpp (modified) (5 diffs)

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

@@ -3165 +3165 @@
 
     /* Invalidate all known menus: */
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QList<int> const updateHandlerKeys = m_menuUpdateHandlers.keys();
+    m_invalidations.unite(QSet<int>(updateHandlerKeys.begin(), updateHandlerKeys.end()));
+#else
     m_invalidations.unite(m_menuUpdateHandlers.keys().toSet());
+#endif
 
     /* Apply language settings: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -212 +212 @@
         /* Get new group list/set: */
         const QStringList &newGroupList = m_newLists.value(strId);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        const UIStringSet newGroupSet(newGroupList.begin(), newGroupList.end());
+#else
         const UIStringSet &newGroupSet = UIStringSet::fromList(newGroupList);
+#endif
         /* Get old group list/set: */
         const QStringList &oldGroupList = m_oldLists.value(strId);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        const UIStringSet oldGroupSet(oldGroupList.begin(), oldGroupList.end());
+#else
         const UIStringSet &oldGroupSet = UIStringSet::fromList(oldGroupList);
+#endif
         /* Make sure group set changed: */
         if (newGroupSet == oldGroupSet)
@@ -899 +907 @@
             /* Remove unregistered cloud VM nodes: */
             if (!unregisteredIDs.isEmpty())
+            {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+                QList<QUuid> listUnregisteredIDs(unregisteredIDs.begin(), unregisteredIDs.end());
+#else
+                QList<QUuid> listUnregisteredIDs = unregisteredIDs.toList();
+#endif
                 sltCloudMachinesUnregistered(guiCloudProfileKey.m_strProviderShortName,
                                              guiCloudProfileKey.m_strProfileName,
-                                             unregisteredIDs.toList());
+                                             listUnregisteredIDs);
+            }
             /* Add registered cloud VM nodes: */
             if (!registeredMachines.isEmpty())

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -429 +429 @@
 
     /* If we have at least one of those items currently selected: */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    {
+        QList<UIChooserItem *> selectedItemsList = selectedItems();
+        QSet<UIChooserItem *> selectedItemsSet(selectedItemsList.begin(), selectedItemsList.end());
+        if (selectedItemsSet.intersects(matchedItems))
+            setSelectedItem(findClosestUnselectedItem());
+    }
+#else
     if (selectedItems().toSet().intersects(matchedItems))
         setSelectedItem(findClosestUnselectedItem());
+#endif
 
     /* If global item is currently chosen, selection should be invalidated: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -1436 +1436 @@
 bool UIKeyboardHandler::keyEventHandleNormal(int iKey, uint8_t uScan, int fFlags, LONG *pCodes, uint *puCodesCount)
 {
-    /* Get host-combo key list: */
-    QSet<int> allHostComboKeys = UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination()).toSet();
     /* Get the type of key - simple or extended: */
     uint8_t uWhatPressed = fFlags & KeyExtended ? IsExtKeyPressed : IsKeyPressed;
@@ -1478 +1476 @@
     /* Ignore key-release if that key was NOT pressed before,
      * but only if thats not one of the host-combination keys: */
-    else if (!allHostComboKeys.contains(iKey))
-        return true;
+    else
+    {
+        /* Get host-combo key list: */
+        QList<int> lstAllHostComboKey = UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination());
+        if (!lstAllHostComboKey.contains(iKey))
+            return true;
+    }
     return false;
 }
@@ -1614 +1617 @@
 {
     /* Get host-combo key list: */
-    QSet<int> allHostComboKeys = UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination()).toSet();
+    QList<int> allHostComboKeys = UIHostCombo::toKeyCodeList(gEDataManager->hostKeyCombination());
 
     /* Update the map of pressed host-combo keys: */
@@ -1632 +1635 @@
         }
     }
+
     /* Check if we are currently holding FULL host-combo: */
-    bool fIsFullHostComboPresent = !allHostComboKeys.isEmpty() && allHostComboKeys == m_pressedHostComboKeys.keys().toSet();
+    bool fIsFullHostComboPresent = false;
+    if (!allHostComboKeys.isEmpty())
+    {
+        const QList<int> &pressedKeyList = m_pressedHostComboKeys.keys();
+        fIsFullHostComboPresent =    QSet<int>(allHostComboKeys.begin(), allHostComboKeys.end())
+                                  == QSet<int>(pressedKeyList.begin(), pressedKeyList.end());
+    }
+
     /* Check if currently pressed/released key had changed host-combo state: */
     const bool isHostComboStateChanged = (!m_bIsHostComboPressed &&  fIsFullHostComboPresent) ||
@@ -1728 +1739 @@
         {
             /* Send prepared scan-codes to the guest: */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            QVector<LONG> scancodes;
+            for (uint i = 0; i < uCodesCount; i++)
+                scancodes.push_back(pCodes[i]);
+            keyboard().PutScancodes(scancodes);
+#else
             std::vector<LONG> scancodes(pCodes, &pCodes[uCodesCount]);
             keyboard().PutScancodes(QVector<LONG>::fromStdVector(scancodes));
+#endif
         }