Changeset 103107 in vbox

Timestamp:

Jan 29, 2024 2:50:20 PM (10 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Refactoring item classes. part 2.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp (modified) (21 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -286 +286 @@
     virtual bool isRunning() const override;
     virtual bool isCloudVM() const override;
-
-    KMachineState m_enmMachineState;
+    void setMachineState(KMachineState enmState);
+
     quint64  m_uCPUVMMLoad;
 
@@ -299 +299 @@
     CSession m_comSession;
     CGuest   m_comGuest;
+    KMachineState m_enmMachineState;
 };
 
@@ -376 +377 @@
     QUuid itemUid(int iIndex);
     int itemIndex(const QUuid &uid);
-    /* Return the state of the machine represented by the item at @rowIndex. */
-    KMachineState machineState(int rowIndex) const;
+    bool isVMRunning(int rowIndex) const;
     void setDefaultViewFont(const QFont &font);
     void setDefaultViewFontColor(const QColor &color);
@@ -397 +397 @@
     void getHostRAMStats();
 
-    QVector<UIActivityOverviewItemLocal> m_itemList;
+    QVector<UIActivityOverviewItem*> m_itemList;
     QMap<int, QString> m_columnTitles;
     QTimer *m_pTimer;
@@ -982 +982 @@
 }
 
+void UIActivityOverviewItemLocal::setMachineState(KMachineState enmState)
+{
+    m_enmMachineState = enmState;
+}
+
 
 /*********************************************************************************************************************************
@@ -1019 +1024 @@
     if (pModel)
     {
-        KMachineState enmLeftState = pModel->machineState(sourceLeftIndex.row());
-        KMachineState enmRightState = pModel->machineState(sourceRightIndex.row());
-        if ((enmLeftState == KMachineState_Running) && (enmRightState != KMachineState_Running))
+        bool fLeftRunning = pModel->isVMRunning(sourceLeftIndex.row());
+        bool fRightRunning = pModel->isVMRunning(sourceRightIndex.row());
+        if (fLeftRunning && fRightRunning)
         {
             if (sortOrder() == Qt::AscendingOrder)
@@ -1028 +1033 @@
                 return false;
         }
-        if ((enmLeftState != KMachineState_Running) && (enmRightState == KMachineState_Running))
+        if (!fLeftRunning && fRightRunning)
         {
             if (sortOrder() == Qt::AscendingOrder)
@@ -1048 +1053 @@
     if (!pModel)
         return true;
-    if (pModel->machineState(iSourceRow) != KMachineState_Running)
+    if (!pModel->isVMRunning(iSourceRow))
         return false;
     return true;
@@ -1111 +1116 @@
 QUuid UIActivityOverviewModel::itemUid(int iIndex)
 {
-    if (iIndex >= m_itemList.size())
+    if (iIndex >= m_itemList.size() || !m_itemList[iIndex])
         return QUuid();
-    return m_itemList[iIndex].m_VMuid;
+    return m_itemList[iIndex]->m_VMuid;
 }
 
@@ -1120 +1125 @@
     for (int i = 0; i < m_itemList.size(); ++i)
     {
-        if (m_itemList[i].m_VMuid == uid)
+        if (!m_itemList[i])
+            continue;
+        if (m_itemList[i]->m_VMuid == uid)
             return i;
     }
@@ -1126 +1133 @@
 }
 
-KMachineState UIActivityOverviewModel::machineState(int rowIndex) const
-{
-    if (rowIndex >= m_itemList.size() || rowIndex < 0)
-        return KMachineState_Null;
-    return m_itemList[rowIndex].m_enmMachineState;
+bool UIActivityOverviewModel::isVMRunning(int rowIndex) const
+{
+    if (rowIndex >= m_itemList.size() || rowIndex < 0 || !m_itemList[rowIndex])
+        return false;
+    return m_itemList[rowIndex]->isRunning();
 }
 
@@ -1145 +1152 @@
 QVariant UIActivityOverviewModel::data(const QModelIndex &index, int role) const
 {
+    Q_UNUSED(index);
+    Q_UNUSED(role);
+    return QVariant();
+#if 0
     if (machineState(index.row()) != KMachineState_Running)
     {
@@ -1163 +1174 @@
         return gpConverter->toString(m_itemList[index.row()].m_enmMachineState);
     return m_itemList[index.row()].m_columnData[index.column()];
+#endif
 }
 
@@ -1170 +1182 @@
      * first of all we are removing all the items,
      * this will detach COM wrappers implicitly: */
+    qDeleteAll(m_itemList);
     m_itemList.clear();
     /* Detaching perf. collector finally,
@@ -1203 +1216 @@
     if (iIndex != -1 && iIndex < m_itemList.size())
     {
-        m_itemList[iIndex].m_enmMachineState = state;
-        if (state == KMachineState_Running)
-            m_itemList[iIndex].resetDebugger();
+        UIActivityOverviewItemLocal *pItem = dynamic_cast<UIActivityOverviewItemLocal*>(m_itemList[iIndex]);
+        if (pItem)
+        {
+            pItem->setMachineState(state);
+            if (state == KMachineState_Running)
+                pItem->resetDebugger();
+        }
     }
 }
@@ -1231 +1248 @@
 void UIActivityOverviewModel::sltTimeout()
 {
+#if 0
     ULONG aPctExecuting;
     ULONG aPctHalted;
@@ -1349 +1367 @@
                 m_columnDataMaxLength[i] = m_itemList[j].m_columnData[i].length();
     }
+#endif
     emit sigDataUpdate();
     emit sigHostStatsUpdate(m_hostStats);
@@ -1373 +1392 @@
 void UIActivityOverviewModel::queryPerformanceCollector()
 {
+#if 0
     QVector<QString>  aReturnNames;
     QVector<CUnknown>  aReturnObjects;
@@ -1456 +1476 @@
             m_itemList[i].m_fRAMUsagePercentage = 100.f * (m_itemList[i].m_uUsedRAM / (float)m_itemList[i].m_uTotalRAM);
     }
+#endif
 }
 
 void UIActivityOverviewModel::addItem(const QUuid& uMachineId, const QString& strMachineName, KMachineState enmState)
 {
-    UIActivityOverviewItemLocal newItem(uMachineId, strMachineName);
-    newItem.m_enmMachineState = enmState;
-    m_itemList.append(newItem);
+    UIActivityOverviewItemLocal *pItem = new UIActivityOverviewItemLocal(uMachineId, strMachineName);
+    pItem->setMachineState(enmState);
+    m_itemList.append(pItem);
 }
 
@@ -1470 +1491 @@
     if (iIndex == -1)
         return;
+    delete m_itemList[iIndex];
     m_itemList.remove(iIndex);
 }
@@ -1804 +1826 @@
     }
     int iMachineIndex = m_pProxyModel->mapToSource(selected.indexes()[0]).row();
-    if (m_pModel->machineState(iMachineIndex) != KMachineState_Running)
+    if (!m_pModel->isVMRunning(iMachineIndex))
     {
         m_pVMActivityMonitorAction->setEnabled(false);