Changeset 97654 in vbox for trunk/src/VBox

Timestamp:

Nov 22, 2022 12:38:58 PM (2 years ago)

Author:

vboxsync

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

154707

Message:

FE/Qt: bugref:9898: Migrating to Qt6; What can actually go wrong #1.

Location:

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

Files:

• UIMonitorCommon.cpp (modified) (2 diffs)
• UIMonitorCommon.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/UIMonitorCommon.cpp

@@ -107 +107 @@
                 QXmlStreamAttributes attributes = xmlReader.attributes();
                 quint64 iCounter = attributes.value("c").toULongLong();
-                xmlData.push_back(UIDebuggerMetricData(attributes.value("name"), iCounter));
+                xmlData.push_back(UIDebuggerMetricData(attributes.value("name").toString(), iCounter));
             }
             else if (xmlReader.name() == QLatin1String("U64"))
@@ -113 +113 @@
                 QXmlStreamAttributes attributes = xmlReader.attributes();
                 quint64 iCounter = attributes.value("val").toULongLong();
-                xmlData.push_back(UIDebuggerMetricData(attributes.value("name"), iCounter));
+                xmlData.push_back(UIDebuggerMetricData(attributes.value("name").toString(), iCounter));
             }
             xmlReader.skipCurrentElement();

trunk/src/VBox/Frontends/VirtualBox/src/activity/UIMonitorCommon.h

@@ -37 +37 @@
     UIDebuggerMetricData()
         : m_counter(0){}
-#ifdef VBOX_IS_QT6_OR_LATER
-    UIDebuggerMetricData(const QStringView &strName, quint64 counter)
-#else
-    UIDebuggerMetricData(const QStringRef &strName, quint64 counter)
-#endif
-        : m_strName(strName.toString())
+    UIDebuggerMetricData(const QString &strName, quint64 counter)
+        : m_strName(strName)
         , m_counter(counter){}
     QString m_strName;