Changeset 98803 in vbox for trunk

Timestamp:

Mar 1, 2023 9:28:49 AM (2 years ago)

Author:

vboxsync

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

156122

Message:

FE/Qt: bugref:10322. Removing CMachine references from UIRuntimeInfoWidget and UIInformationRuntime classes.

Location:

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

Files:

• UIInformationRuntime.cpp (modified) (9 diffs)
• UIInformationRuntime.h (modified) (3 diffs)
• UIVMInformationDialog.cpp (modified) (1 diff)

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

@@ -77 +77 @@
 public:
 
-    UIRuntimeInfoWidget(QWidget *pParent, const CMachine &machine);
+    UIRuntimeInfoWidget(QWidget *pParent);
     void updateScreenInfo(int iScreenId = -1);
     void updateGAsVersion();
@@ -109 +109 @@
     void insertInfoRow(InfoRow enmInfoRow, const QString& strLabel, const QString &strInfo, int iRow = -1);
     void computeMinimumWidth();
-
-    CMachine m_machine;
 
     /** @name Cached translated strings.
@@ -149 +147 @@
 *********************************************************************************************************************************/
 
-UIRuntimeInfoWidget::UIRuntimeInfoWidget(QWidget *pParent, const CMachine &machine)
+UIRuntimeInfoWidget::UIRuntimeInfoWidget(QWidget *pParent)
     : QIWithRetranslateUI<QTableWidget>(pParent)
-    , m_machine(machine)
     , m_iMinimumWidth(0)
     , m_pTimer(0)
@@ -276 +273 @@
 void UIRuntimeInfoWidget::updateScreenInfo(int iScreenID /* = -1 */)
 {
-    ULONG uGuestScreens = m_machine.GetGraphicsAdapter().GetMonitorCount();
+    AssertPtrReturnVoid(gpMachine);
+    ulong uGuestScreens = 0;
+    gpMachine->acquireMonitorCount(uGuestScreens);
+    AssertReturnVoid(uGuestScreens > 0);
+
     m_screenResolutions.resize(uGuestScreens);
     if (iScreenID != -1 && iScreenID >= (int)uGuestScreens)
@@ -381 +382 @@
     QString strUnrestrictedExecution = gpMachine->isHWVirtExUXEnabled() ?
         m_strUnrestrictedExecutionActive : m_strUnrestrictedExecutionInactive;
-    QString strParavirtProvider = gpConverter->toString(m_machine.GetEffectiveParavirtProvider());
+    QString strParavirtProvider = gpConverter->toString(gpMachine->paravirtProvider());
 
     updateInfoRow(InfoRow_ExecutionEngine, QString("%1").arg(m_strExcutionEngineLabel), strExecutionEngine);
@@ -419 +420 @@
 void UIRuntimeInfoWidget::updateClipboardMode(KClipboardMode enmMode /* = KClipboardMode_Max */)
 {
+    AssertPtrReturnVoid(gpMachine);
     if (enmMode == KClipboardMode_Max)
+    {
+        KClipboardMode enmClipboardMode = KClipboardMode_Max;
+        gpMachine->acquireClipboardMode(enmClipboardMode);
         updateInfoRow(InfoRow_ClipboardMode, QString("%1").arg(m_strClipboardModeLabel),
-                      gpConverter->toString(m_machine.GetClipboardMode()));
+                      gpConverter->toString(enmClipboardMode));
+    }
     else
         updateInfoRow(InfoRow_ClipboardMode, QString("%1").arg(m_strClipboardModeLabel),
@@ -429 +435 @@
 void UIRuntimeInfoWidget::updateDnDMode(KDnDMode enmMode /* = KDnDMode_Max */)
 {
+    AssertPtrReturnVoid(gpMachine);
     if (enmMode == KDnDMode_Max)
+    {
+        KDnDMode enmDnDMode = KDnDMode_Max;
+        gpMachine->acquireDnDMode(enmDnDMode);
         updateInfoRow(InfoRow_DnDMode, QString("%1").arg(m_strDragAndDropLabel),
-                  gpConverter->toString(m_machine.GetDnDMode()));
+                  gpConverter->toString(enmDnDMode));
+    }
     else
         updateInfoRow(InfoRow_DnDMode, QString("%1").arg(m_strDragAndDropLabel),
@@ -504 +515 @@
 *********************************************************************************************************************************/
 
-UIInformationRuntime::UIInformationRuntime(QWidget *pParent, const CMachine &machine, const UIMachine *pMachine)
+UIInformationRuntime::UIInformationRuntime(QWidget *pParent, const UIMachine *pMachine)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_machine(machine)
     , m_pMainLayout(0)
     , m_pRuntimeInfoWidget(0)
@@ -534 +544 @@
     m_pMainLayout->setSpacing(0);
 
-    m_pRuntimeInfoWidget = new UIRuntimeInfoWidget(0, m_machine);
+    m_pRuntimeInfoWidget = new UIRuntimeInfoWidget(0);
     AssertReturnVoid(m_pRuntimeInfoWidget);
     connect(m_pRuntimeInfoWidget, &UIRuntimeInfoWidget::customContextMenuRequested,

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.h

@@ -35 +35 @@
 #include <QWidget>
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CMachine.h"
-
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
@@ -56 +52 @@
 public:
 
-    /** Constructs information-tab passing @a pParent to the QWidget base-class constructor.
-      * @param machine is machine reference. */
-    UIInformationRuntime(QWidget *pParent, const CMachine &machine, const UIMachine *pMachine);
+    /** Constructs information-tab passing @a pParent to the QWidget base-class constructor. */
+    UIInformationRuntime(QWidget *pParent, const UIMachine *pMachine);
 
 protected:
@@ -81 +76 @@
     void prepareObjects();
 
-    CMachine m_machine;
-
     /** Holds the instance of layout we create. */
     QVBoxLayout *m_pMainLayout;

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

@@ -218 +218 @@
         /* Create Runtime Information tab: */
         UIInformationRuntime *pInformationRuntimeWidget =
-            new UIInformationRuntime(this, m_pMachine->uisession()->machine(), m_pMachine);
+            new UIInformationRuntime(this, m_pMachine);
         if (pInformationRuntimeWidget)
         {