Changeset 85594 in vbox

Timestamp:

Aug 3, 2020 10:48:32 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510. Don't cache QVector's indices. That is very stupid

File:

• trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -303 +303 @@
     const QMap<int, int> dataLengths() const;
     QUuid itemUid(int iIndex);
+    int itemIndex(const QUuid &uid);
 
 private slots:
@@ -320 +321 @@
 
     QVector<UIResourceMonitorItem> m_itemList;
-    /* Used to find machines by uid. key is the machine uid and int is the index to m_itemList */
-    QMap<QUuid, int>               m_itemMap;
     QMap<int, QString> m_columnTitles;
     QTimer *m_pTimer;
@@ -956 +955 @@
 }
 
+int UIResourceMonitorModel::itemIndex(const QUuid &uid)
+{
+    for (int i = 0; i < m_itemList.size(); ++i)
+    {
+        if (m_itemList[i].m_VMuid == uid)
+            return i;
+    }
+    return -1;
+}
+
 QVariant UIResourceMonitorModel::data(const QModelIndex &index, int role) const
 {
@@ -990 +999 @@
 void UIResourceMonitorModel::sltMachineStateChanged(const QUuid &uId, const KMachineState state)
 {
-    int iIndex = m_itemMap.value(uId, -1);
+    int iIndex = itemIndex(uId);
     /* Remove the machine in case machine is no longer working. */
     if (iIndex != -1 && state != KMachineState_Running)
@@ -1198 +1207 @@
                     if (comMachine.isNull())
                         continue;
-                    int iIndex = m_itemMap.value(comMachine.GetId(), -1);
+                    int iIndex = itemIndex(comMachine.GetId());
                     if (iIndex == -1 || iIndex >= m_itemList.size())
                         continue;
@@ -1253 +1262 @@
 void UIResourceMonitorModel::addItem(const QUuid& uMachineId, const QString& strMachineName)
 {
-    int iIndex = m_itemList.size();
     m_itemList.append(UIResourceMonitorItem(uMachineId, strMachineName));
-    m_itemMap[uMachineId] = iIndex;
 }
 
 void UIResourceMonitorModel::removeItem(const QUuid& uMachineId)
 {
-    int iIndex = m_itemMap.value(uMachineId, -1);
+    int iIndex = itemIndex(uMachineId);
     if (iIndex == -1)
         return;
     m_itemList.remove(iIndex);
-    m_itemMap.remove(uMachineId);
 }