Changeset 104592 in vbox for trunk/src

Timestamp:

May 13, 2024 12:34:31 PM (12 months ago)

Author:

vboxsync

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

163133

Message:

FE/Qt: bugref:10450: Get rid of pre-5.14 code related to QSet/QList conversion.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -3647 +3647 @@
 
     /* Invalidate all known menus: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QList<int> const updateHandlerKeys = m_menuUpdateHandlers.keys();
+    const 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

@@ -222 +222 @@
     {
         /* Get new group list/set: */
-        const QStringList &newGroupList = m_newLists.value(strId);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        const QStringList newGroupList = m_newLists.value(strId);
         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 QStringList oldGroupList = m_oldLists.value(strId);
         const UIStringSet oldGroupSet(oldGroupList.begin(), oldGroupList.end());
-#else
-        const UIStringSet &oldGroupSet = UIStringSet::fromList(oldGroupList);
-#endif
         /* Make sure group set changed: */
         if (newGroupSet == oldGroupSet)
@@ -999 +991 @@
             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
+                const QList<QUuid> listUnregisteredIDs(unregisteredIDs.begin(), unregisteredIDs.end());
                 sltCloudMachinesUnregistered(guiCloudProfileKey.m_strProviderShortName,
                                              guiCloudProfileKey.m_strProfileName,

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

@@ -1627 +1627 @@
     if (!allHostComboKeys.isEmpty())
     {
-        const QList<int> &pressedKeyList = m_pressedHostComboKeys.keys();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+        const QList<int> pressedKeyList = m_pressedHostComboKeys.keys();
         fIsFullHostComboPresent =    QSet<int>(allHostComboKeys.begin(), allHostComboKeys.end())
                                   == QSet<int>(pressedKeyList.begin(), pressedKeyList.end());
-#else
-        fIsFullHostComboPresent = allHostComboKeys.toSet() == pressedKeyList.toSet();
-#endif
     }