Changeset 98762 in vbox for trunk

Timestamp:

Feb 27, 2023 5:24:41 PM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322. Fix for r156066. Must use UIMachine wrapper.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (3 diffs)
• information/UIInformationConfiguration.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -829 +829 @@
                                            isHWVirtExUXEnabled(),
                                            paravirtProvider());
+}
+
+void UIMachine::generateMachineInformationGeneral(const UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral &fOptions,
+                                                  UITextTable &returnTable)
+{
+    uisession()->generateMachineInformationGeneral(fOptions, returnTable);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -40 +40 @@
 #include "UIMachineDefs.h"
 #include "UIMousePointerShapeData.h"
+#include "UITextTable.h"
 
 /* COM includes: */
@@ -47 +48 @@
 class QWidget;
 class UIActionPool;
+class UIMachineLogic;
 class UISession;
-class UIMachineLogic;
 class CMediumAttachment;
 class CNetworkAdapter;
@@ -627 +628 @@
     /** @} */
 
+    /** @name VM information stuff.
+     ** @{ */
+        /** Return general info. for the machine(). */
+        void generateMachineInformationGeneral(const UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral &fOptions,
+                                               UITextTable &returnTable);
+    /** @} */
+
 public slots:
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp

@@ -45 +45 @@
 #include "UIInformationConfiguration.h"
 #include "UIMachine.h"
-#include "UISession.h"
 #include "UIVirtualBoxEventHandler.h"
 
@@ -110 +109 @@
 void UIInformationConfiguration::createTableItems()
 {
-    if (!m_pTableWidget)
-        return;
-    if (!gpMachine || !gpMachine->uisession())
-        return;
-    UISession *pSession = gpMachine->uisession();
+    if (!m_pTableWidget || !gpMachine)
+        return;
+
     resetTable();
     QFontMetrics fontMetrics(m_pTableWidget->font());
     int iMaxColumn1Length = 0;
+
     /* General section: */
     insertTitleRow(m_strGeneralTitle, UIIconPool::iconSet(":/machine_16px.png"), fontMetrics);
     UITextTable infoRows;
-    pSession->generateMachineInformationGeneral(UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Default, infoRows);
+    gpMachine->generateMachineInformationGeneral(UIExtraDataMetaDefs::DetailsElementOptionTypeGeneral_Default, infoRows);
     insertInfoRows(infoRows, fontMetrics, iMaxColumn1Length);