Changeset 103481 in vbox

Timestamp:

Feb 20, 2024 4:37:38 PM (10 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:3409: A bit of fixes for details generator stuff which is used in Details and Snapshot panes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (2 diffs)
• globals/UIDetailsGenerator.h (modified) (2 diffs)
• manager/details/UIDetailsElements.h (modified) (1 diff)
• snapshots/UISnapshotDetailsWidget.cpp (modified) (3 diffs)
• snapshots/UISnapshotDetailsWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -717 +717 @@
 }
 
-QString summarizeGenericProperties(const CNetworkAdapter &comAdapter)
-{
-    QVector<QString> names;
-    QVector<QString> props;
-    props = comAdapter.GetProperties(QString(), names);
-    QString strResult;
-    for (int i = 0; i < names.size(); ++i)
-    {
-        strResult += names[i] + "=" + props[i];
-        if (i < names.size() - 1)
-            strResult += ", ";
-    }
-    return strResult;
-}
-
 UITextTable UIDetailsGenerator::generateMachineInformationNetwork(CMachine &comMachine,
                                                                   const UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork &fOptions)
@@ -1559 +1544 @@
         strInfo += e_strTableRow2.arg(UICommon::tr("Processors", "details report"), QString::number(cCpuCount));
 }
+
+QString UIDetailsGenerator::summarizeGenericProperties(const CNetworkAdapter &comAdapter)
+{
+    QVector<QString> names;
+    QVector<QString> props;
+    props = comAdapter.GetProperties(QString(), names);
+    QString strResult;
+    for (int i = 0; i < names.size(); ++i)
+    {
+        strResult += names[i] + "=" + props[i];
+        if (i < names.size() - 1)
+            strResult += ", ";
+    }
+    return strResult;
+}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.h

@@ -45 +45 @@
 class CGuest;
 class CMachine;
+class CNetworkAdapter;
 
 /** Details generation namespace. */
@@ -119 +120 @@
                                                         KParavirtProvider enmProvider);
 
+    SHARED_LIBRARY_STUFF QString summarizeGenericProperties(const CNetworkAdapter &comAdapter);
+
     /** Holds the table row format 1. */
     extern const QString e_strTableRow1;

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.h

@@ -392 +392 @@
     void run();
 
-    /** Summarizes generic properties. */
-    static QString summarizeGenericProperties(const CNetworkAdapter &adapter);
-
     /** Holds the options. */
     UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork m_fOptions;

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -51 +51 @@
 #include "UICursor.h"
 #include "UIDesktopWidgetWatchdog.h"
+#include "UIDetailsGenerator.h"
 #include "UIIconPool.h"
 #include "UIGuestOSType.h"
@@ -1992 +1993 @@
                 case KNetworkAttachmentType_Generic:
                 {
-                    QString strGenericDriverProperties(summarizeGenericProperties(comAdapter));
+                    QString strGenericDriverProperties(UIDetailsGenerator::summarizeGenericProperties(comAdapter));
                     strInfo = strInfo.arg(  strGenericDriverProperties.isNull()
                                           ? strInfo.arg(QApplication::translate("UIDetails", "Generic Driver, '%1'", "details (network)")
@@ -2106 +2107 @@
 }
 
-/* static */
-QString UISnapshotDetailsWidget::summarizeGenericProperties(const CNetworkAdapter &comNetwork)
-{
-    QVector<QString> names;
-    QVector<QString> props;
-    props = comNetwork.GetProperties(QString(), names);
-    QString strResult;
-    for (int i = 0; i < names.size(); ++i)
-    {
-        strResult += names[i] + "=" + props[i];
-        if (i < names.size() - 1)
-            strResult += ", ";
-    }
-    return strResult;
-}
-
 #include "UISnapshotDetailsWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.h

@@ -211 +211 @@
     static QString empReport(const QString &strValue, bool fIgnore);
 
-    /** Summarizes generic properties. */
-    static QString summarizeGenericProperties(const CNetworkAdapter &adapter);
-
     /** Holds the machine object to load data from. */
     CMachine   m_comMachine;