Changeset 98874 in vbox for trunk/src

Timestamp:

Mar 8, 2023 9:34:42 AM (22 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Cleanup for UIVMInformationDialog related to UIMachine global pointer.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• information/UIInformationConfiguration.h (modified) (1 diff)
• information/UIInformationRuntime.cpp (modified) (2 diffs)
• information/UIInformationRuntime.h (modified) (1 diff)
• information/UIVMInformationDialog.cpp (modified) (6 diffs)
• information/UIVMInformationDialog.h (modified) (3 diffs)

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

@@ -1618 +1618 @@
 
     if (!m_pVMInformationDialog)
-        m_pVMInformationDialog = new UIVMInformationDialog(uimachine());
+        m_pVMInformationDialog = new UIVMInformationDialog;
 
     if (m_pVMInformationDialog)

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

@@ -51 +51 @@
 public:
 
-    /** Constructs information-tab passing @a pParent to the QWidget base-class constructor. */
+    /** Constructs information-tab passing @a pParent to the base-class. */
     UIInformationConfiguration(QWidget *pParent);
 

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

@@ -515 +515 @@
 *********************************************************************************************************************************/
 
-UIInformationRuntime::UIInformationRuntime(QWidget *pParent, const UIMachine *pMachine)
+UIInformationRuntime::UIInformationRuntime(QWidget *pParent)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pMainLayout(0)
@@ -521 +521 @@
     , m_pCopyWholeTableAction(0)
 {
-    connect(pMachine, &UIMachine::sigAdditionsStateChange, this, &UIInformationRuntime::sltGuestAdditionsStateChange);
-    connect(pMachine, &UIMachine::sigGuestMonitorChange, this, &UIInformationRuntime::sltGuestMonitorChange);
-    connect(pMachine, &UIMachine::sigVRDEChange, this, &UIInformationRuntime::sltVRDEChange);
-    connect(pMachine, &UIMachine::sigClipboardModeChange, this, &UIInformationRuntime::sltClipboardChange);
-    connect(pMachine, &UIMachine::sigDnDModeChange, this, &UIInformationRuntime::sltDnDModeChange);
+    connect(gpMachine, &UIMachine::sigAdditionsStateChange, this, &UIInformationRuntime::sltGuestAdditionsStateChange);
+    connect(gpMachine, &UIMachine::sigGuestMonitorChange, this, &UIInformationRuntime::sltGuestMonitorChange);
+    connect(gpMachine, &UIMachine::sigVRDEChange, this, &UIInformationRuntime::sltVRDEChange);
+    connect(gpMachine, &UIMachine::sigClipboardModeChange, this, &UIInformationRuntime::sltClipboardChange);
+    connect(gpMachine, &UIMachine::sigDnDModeChange, this, &UIInformationRuntime::sltDnDModeChange);
 
     prepareObjects();

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

@@ -52 +52 @@
 public:
 
-    /** Constructs information-tab passing @a pParent to the QWidget base-class constructor. */
-    UIInformationRuntime(QWidget *pParent, const UIMachine *pMachine);
+    /** Constructs information-tab passing @a pParent to the base-class. */
+    UIInformationRuntime(QWidget *pParent);
 
 protected:

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

@@ -51 +51 @@
 #include "VBoxUtils.h"
 
-UIVMInformationDialog::UIVMInformationDialog(UIMachine *pMachine)
+UIVMInformationDialog::UIVMInformationDialog()
     : QMainWindowWithRestorableGeometryAndRetranslateUi(0)
-    , m_pMachine(pMachine)
     , m_pTabWidget(0)
     , m_fCloseEmitted(false)
@@ -156 +155 @@
 void UIVMInformationDialog::prepare()
 {
-    /* Load and clear: */
-    AssertPtrReturnVoid(m_pMachine);
-
     m_uMachineId = uiCommon().managedVMUuid();
-    m_strMachineName = m_pMachine->machineName();
+    m_strMachineName = gpMachine->machineName();
 #ifdef VBOX_WS_MAC
     /* No window-icon on Mac OS X, because it acts as proxy icon which isn't necessary here. */
@@ -218 +214 @@
         /* Create Runtime Information tab: */
         UIInformationRuntime *pInformationRuntimeWidget =
-            new UIInformationRuntime(this, m_pMachine);
+            new UIInformationRuntime(this);
         if (pInformationRuntimeWidget)
         {
@@ -227 +223 @@
         /* Create Performance Monitor tab: */
         UIVMActivityMonitor *pVMActivityMonitorWidget =
-            new UIVMActivityMonitor(EmbedTo_Dialog, this, m_pMachine->uisession()->machine());
+            new UIVMActivityMonitor(EmbedTo_Dialog, this, gpMachine->uisession()->machine());
         if (pVMActivityMonitorWidget)
         {
-            connect(m_pMachine, &UIMachine::sigAdditionsStateChange,
+            connect(gpMachine, &UIMachine::sigAdditionsStateChange,
                     pVMActivityMonitorWidget, &UIVMActivityMonitor::sltGuestAdditionsStateChange);
             m_tabs.insert(Tabs_ActivityMonitor, pVMActivityMonitorWidget);
@@ -238 +234 @@
         /* Create Guest Process Control tab: */
         UIGuestProcessControlWidget *pGuestProcessControlWidget =
-            new UIGuestProcessControlWidget(EmbedTo_Dialog, m_pMachine->uisession()->guest(),
+            new UIGuestProcessControlWidget(EmbedTo_Dialog, gpMachine->uisession()->guest(),
                                             this, m_strMachineName, false /* fShowToolbar */);
         if (pGuestProcessControlWidget)
@@ -283 +279 @@
 void UIVMInformationDialog::loadDialogGeometry()
 {
-    const QRect geo = gEDataManager->sessionInformationDialogGeometry(this, m_pMachine->activeWindow());
+    const QRect geo = gEDataManager->sessionInformationDialogGeometry(this, gpMachine->activeWindow());
     LogRel2(("GUI: UIVMInformationDialog: Restoring geometry to: Origin=%dx%d, Size=%dx%d\n",
              geo.x(), geo.y(), geo.width(), geo.height()));

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

@@ -44 +44 @@
 class QITabWidget;
 class QIDialogButtonBox;
-class UIMachine;
 
 /* Type definitions: */
@@ -63 +62 @@
 public:
 
-    /** Constructs information dialog for passed @a pMachine. */
-    UIVMInformationDialog(UIMachine *pMachine);
+    /** Constructs information dialog. */
+    UIVMInformationDialog();
 
     /** Returns whether the dialog should be maximized when geometry being restored. */
@@ -105 +104 @@
     void saveDialogGeometry();
 
-    /** Holds the machine UI reference. */
-    UIMachine *m_pMachine;
-
     /** @name Widget variables.
      * @{ */