Changeset 102901 in vbox for trunk/src

Timestamp:

Jan 16, 2024 3:26:01 PM (16 months ago)

Author:

vboxsync

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

161123

Message:

FE/Qt: bugref:10501. Removing some obsolete variables.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity

Files:

• UIVMActivityMonitor.cpp (modified) (13 diffs)
• UIVMActivityMonitor.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -1188 +1188 @@
     , m_pTimer(0)
     , m_iTimeStep(0)
-    , m_strCPUMetricName("CPU Load")
-    , m_strRAMMetricName("RAM Usage")
     , m_iMaximumQueueSize(iMaximumQueueSize)
     , m_pMainLayout(0)
@@ -1371 +1369 @@
 UIVMActivityMonitorLocal::UIVMActivityMonitorLocal(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine)
     :UIVMActivityMonitor(enmEmbedding, pParent, 120 /* iMaximumQueueSize */)
-    , m_strVMExitMetricName("VMExits")
-    , m_strNetworkMetricName("Network")
-    , m_strDiskIOMetricName("DiskIO")
     , m_fGuestAdditionsAvailable(false)
 {
@@ -1657 +1652 @@
                 if (strName.contains("RAM", Qt::CaseInsensitive) && strName.contains("Free", Qt::CaseInsensitive))
                 {
-                    UIMetric ramMetric(m_strRAMMetricName, metrics[i].GetUnit(), m_iMaximumQueueSize);
+                    UIMetric ramMetric("", metrics[i].GetUnit(), m_iMaximumQueueSize);
                     ramMetric.setDataSeriesName(0, "Free");
                     ramMetric.setDataSeriesName(1, "Used");
@@ -1668 +1663 @@
 
     /* CPU Metric: */
-    UIMetric cpuMetric(m_strCPUMetricName, "%", m_iMaximumQueueSize);
+    UIMetric cpuMetric("", "%", m_iMaximumQueueSize);
     cpuMetric.setDataSeriesName(0, "Guest Load");
     cpuMetric.setDataSeriesName(1, "VMM Load");
@@ -1674 +1669 @@
 
     /* Network metric: */
-    UIMetric networkMetric(m_strNetworkMetricName, "B", m_iMaximumQueueSize);
+    UIMetric networkMetric("", "B", m_iMaximumQueueSize);
     networkMetric.setDataSeriesName(0, "Receive Rate");
     networkMetric.setDataSeriesName(1, "Transmit Rate");
@@ -1681 +1676 @@
 
     /* Disk IO metric */
-    UIMetric diskIOMetric(m_strDiskIOMetricName, "B", m_iMaximumQueueSize);
+    UIMetric diskIOMetric("", "B", m_iMaximumQueueSize);
     diskIOMetric.setDataSeriesName(0, "Write Rate");
     diskIOMetric.setDataSeriesName(1, "Read Rate");
@@ -1688 +1683 @@
 
     /* VM exits metric */
-    UIMetric VMExitsMetric(m_strVMExitMetricName, "times", m_iMaximumQueueSize);
+    UIMetric VMExitsMetric("", "times", m_iMaximumQueueSize);
     VMExitsMetric.setAutoUpdateMaximum(true);
     m_metrics.insert(Metric_Type_VM_Exits, VMExitsMetric);
@@ -1933 +1928 @@
 UIVMActivityMonitorCloud::UIVMActivityMonitorCloud(EmbedTo enmEmbedding, QWidget *pParent, const CCloudMachine &machine)
     :UIVMActivityMonitor(enmEmbedding, pParent, 60 /* iMaximumQueueSize */)
-    , m_strNetworkInMetricName("Network Receive")
-    , m_strNetworkOutMetricName("Network Transmit")
-    , m_strDiskIOReadMetricName("Disk Written")
-    , m_strDiskIOWrittenMetricName("Disk Read")
     , m_pMachineStateUpdateTimer(0)
     , m_enmMachineState(KCloudMachineState_Invalid)
@@ -2390 +2381 @@
     if (m_iTotalRAM != 0)
     {
-        UIMetric ramMetric(m_strRAMMetricName, "kb", m_iMaximumQueueSize);
+        UIMetric ramMetric("", "kb", m_iMaximumQueueSize);
         ramMetric.setDataSeriesName(0, "Used");
         m_metrics.insert(Metric_Type_RAM, ramMetric);
@@ -2396 +2387 @@
 
     /* CPU Metric: */
-    UIMetric cpuMetric(m_strCPUMetricName, "%", m_iMaximumQueueSize);
+    UIMetric cpuMetric("", "%", m_iMaximumQueueSize);
     cpuMetric.setDataSeriesName(0, "CPU Utilization");
     m_metrics.insert(Metric_Type_CPU, cpuMetric);
 
     /* Network in metric: */
-    UIMetric networkInMetric(m_strNetworkInMetricName, "B", m_iMaximumQueueSize);
+    UIMetric networkInMetric("", "B", m_iMaximumQueueSize);
     networkInMetric.setDataSeriesName(0, "Receive Rate");
     networkInMetric.setAutoUpdateMaximum(true);
@@ -2407 +2398 @@
 
     /* Network out metric: */
-    UIMetric networkOutMetric(m_strNetworkOutMetricName, "B", m_iMaximumQueueSize);
+    UIMetric networkOutMetric("", "B", m_iMaximumQueueSize);
     networkOutMetric.setDataSeriesName(0, "Transmit Rate");
     networkOutMetric.setAutoUpdateMaximum(true);
@@ -2413 +2404 @@
 
     /* Disk write metric */
-    UIMetric diskIOWrittenMetric(m_strDiskIOWrittenMetricName, "B", m_iMaximumQueueSize);
+    UIMetric diskIOWrittenMetric("", "B", m_iMaximumQueueSize);
     diskIOWrittenMetric.setDataSeriesName(0, "Write Rate");
     diskIOWrittenMetric.setAutoUpdateMaximum(true);
@@ -2419 +2410 @@
 
     /* Disk read metric */
-    UIMetric diskIOReadMetric(m_strDiskIOReadMetricName, "B", m_iMaximumQueueSize);
+    UIMetric diskIOReadMetric("", "B", m_iMaximumQueueSize);
     diskIOReadMetric.setDataSeriesName(0, "Read Rate");
     diskIOReadMetric.setAutoUpdateMaximum(true);

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -191 +191 @@
     quint64                 m_iTimeStep;
     QMap<Metric_Type, UIMetric> m_metrics;
-
-    /** @name These metric names are used for map keys to identify metrics. They are not translated.
-      * @{ */
-        QString m_strCPUMetricName;
-        QString m_strRAMMetricName;
-    /** @} */
 
     /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
@@ -301 +295 @@
     virtual void prepareWidgets() RT_OVERRIDE;
 
-    QString m_strVMExitMetricName;
-    QString m_strNetworkMetricName;
-    QString m_strDiskIOMetricName;
-
     bool m_fGuestAdditionsAvailable;
     CMachine m_comMachine;
@@ -367 +357 @@
     void determineTotalRAMAmount();
 
-    QString m_strNetworkInMetricName;
-    QString m_strNetworkOutMetricName;
-    QString m_strDiskIOReadMetricName;
-    QString m_strDiskIOWrittenMetricName;
-
     CCloudMachine m_comMachine;
     QPointer<UIProgressTaskReadCloudMachineMetricList> m_ReadListProgressTask;