Changeset 102903 in vbox for trunk/src

Timestamp:

Jan 16, 2024 3:37:33 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Some more cleaning.

Location:

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

Files:

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

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

@@ -979 +979 @@
 *********************************************************************************************************************************/
 
-UIMetric::UIMetric(const QString &strName, const QString &strUnit, int iMaximumQueueSize)
-    : m_strName(strName)
-    , m_strUnit(strUnit)
+UIMetric::UIMetric(const QString &strUnit, int iMaximumQueueSize)
+    : m_strUnit(strUnit)
     , m_iMaximum(0)
     , m_fRequiresGuestAdditions(false)
@@ -1000 +999 @@
 }
 
-const QString &UIMetric::name() const
-{
-    return m_strName;
-}
-
 void UIMetric::setMaximum(quint64 iMaximum)
 {
@@ -1153 +1147 @@
 void UIMetric::toFile(QTextStream &stream) const
 {
-    stream << "Metric Name: " << m_strName << "\n";
     stream << "Unit: " << m_strUnit << "\n";
     stream << "Maximum: " << m_iMaximum << "\n";
@@ -1652 +1645 @@
                 if (strName.contains("RAM", Qt::CaseInsensitive) && strName.contains("Free", Qt::CaseInsensitive))
                 {
-                    UIMetric ramMetric("", metrics[i].GetUnit(), m_iMaximumQueueSize);
+                    UIMetric ramMetric(metrics[i].GetUnit(), m_iMaximumQueueSize);
                     ramMetric.setDataSeriesName(0, "Free");
                     ramMetric.setDataSeriesName(1, "Used");
@@ -1663 +1656 @@
 
     /* CPU Metric: */
-    UIMetric cpuMetric("", "%", m_iMaximumQueueSize);
+    UIMetric cpuMetric("%", m_iMaximumQueueSize);
     cpuMetric.setDataSeriesName(0, "Guest Load");
     cpuMetric.setDataSeriesName(1, "VMM Load");
@@ -1669 +1662 @@
 
     /* Network metric: */
-    UIMetric networkMetric("", "B", m_iMaximumQueueSize);
+    UIMetric networkMetric("B", m_iMaximumQueueSize);
     networkMetric.setDataSeriesName(0, "Receive Rate");
     networkMetric.setDataSeriesName(1, "Transmit Rate");
@@ -1676 +1669 @@
 
     /* Disk IO metric */
-    UIMetric diskIOMetric("", "B", m_iMaximumQueueSize);
+    UIMetric diskIOMetric("B", m_iMaximumQueueSize);
     diskIOMetric.setDataSeriesName(0, "Write Rate");
     diskIOMetric.setDataSeriesName(1, "Read Rate");
@@ -1683 +1676 @@
 
     /* VM exits metric */
-    UIMetric VMExitsMetric("", "times", m_iMaximumQueueSize);
+    UIMetric VMExitsMetric("times", m_iMaximumQueueSize);
     VMExitsMetric.setAutoUpdateMaximum(true);
     m_metrics.insert(Metric_Type_VM_Exits, VMExitsMetric);
@@ -2381 +2374 @@
     if (m_iTotalRAM != 0)
     {
-        UIMetric ramMetric("", "kb", m_iMaximumQueueSize);
+        UIMetric ramMetric("kb", m_iMaximumQueueSize);
         ramMetric.setDataSeriesName(0, "Used");
         m_metrics.insert(Metric_Type_RAM, ramMetric);
@@ -2387 +2380 @@
 
     /* CPU Metric: */
-    UIMetric cpuMetric("", "%", m_iMaximumQueueSize);
+    UIMetric cpuMetric("%", m_iMaximumQueueSize);
     cpuMetric.setDataSeriesName(0, "CPU Utilization");
     m_metrics.insert(Metric_Type_CPU, cpuMetric);
 
     /* Network in metric: */
-    UIMetric networkInMetric("", "B", m_iMaximumQueueSize);
+    UIMetric networkInMetric("B", m_iMaximumQueueSize);
     networkInMetric.setDataSeriesName(0, "Receive Rate");
     networkInMetric.setAutoUpdateMaximum(true);
@@ -2398 +2391 @@
 
     /* Network out metric: */
-    UIMetric networkOutMetric("", "B", m_iMaximumQueueSize);
+    UIMetric networkOutMetric("B", m_iMaximumQueueSize);
     networkOutMetric.setDataSeriesName(0, "Transmit Rate");
     networkOutMetric.setAutoUpdateMaximum(true);
@@ -2404 +2397 @@
 
     /* Disk write metric */
-    UIMetric diskIOWrittenMetric("", "B", m_iMaximumQueueSize);
+    UIMetric diskIOWrittenMetric("B", m_iMaximumQueueSize);
     diskIOWrittenMetric.setDataSeriesName(0, "Write Rate");
     diskIOWrittenMetric.setAutoUpdateMaximum(true);
@@ -2410 +2403 @@
 
     /* Disk read metric */
-    UIMetric diskIOReadMetric("", "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

@@ -85 +85 @@
 public:
 
-    UIMetric(const QString &strName, const QString &strUnit, int iMaximumQueueSize);
+    UIMetric(const QString &strUnit, int iMaximumQueueSize);
     UIMetric();
-    const QString &name() const;
 
     void setMaximum(quint64 iMaximum);
@@ -126 +125 @@
     void updateMax();
 
-    QString m_strName;
     QString m_strUnit;
     QString m_strDataSeriesName[DATA_SERIES_SIZE];