Changeset 98647 in vbox for trunk/src

Timestamp:

Feb 20, 2023 12:35:52 PM (2 years ago)

Author:

vboxsync

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

155947

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CConsole wrapper usage step-by-step; Stuff related to guest process control dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIGuestProcessControlDialog.cpp (modified) (4 diffs)
• guestctrl/UIGuestProcessControlDialog.h (modified) (5 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp

@@ -37 +37 @@
 #include "UIGuestProcessControlDialog.h"
 #include "UICommon.h"
+#include "UIMachine.h"
+#include "UISession.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -46 +48 @@
 *********************************************************************************************************************************/
 
-UIGuestProcessControlDialogFactory::UIGuestProcessControlDialogFactory(UIActionPool *pActionPool /* = 0 */,
-                                                         const CGuest &comGuest /* = CGuest() */,
-                                                         const QString &strMachineName /* = QString() */)
-    : m_pActionPool(pActionPool)
-    , m_comGuest(comGuest)
-    , m_strMachineName(strMachineName)
+UIGuestProcessControlDialogFactory::UIGuestProcessControlDialogFactory(UIMachine *pMachine /* = 0 */)
+    : m_pMachine(pMachine)
 {
 }
@@ -57 +55 @@
 void UIGuestProcessControlDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
 {
-    pDialog = new UIGuestProcessControlDialog(pCenterWidget, m_pActionPool, m_comGuest, m_strMachineName);
+    AssertPtrReturnVoid(m_pMachine);
+    pDialog = new UIGuestProcessControlDialog(pCenterWidget, m_pMachine);
 }
 
@@ -65 +64 @@
 *********************************************************************************************************************************/
 
-UIGuestProcessControlDialog::UIGuestProcessControlDialog(QWidget *pCenterWidget,
-                                           UIActionPool *pActionPool,
-                                           const CGuest &comGuest,
-                                           const QString &strMachineName /* = QString() */)
+UIGuestProcessControlDialog::UIGuestProcessControlDialog(QWidget *pCenterWidget, UIMachine *pMachine)
     : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
-    , m_pActionPool(pActionPool)
-    , m_comGuest(comGuest)
-    , m_strMachineName(strMachineName)
+    , m_pMachine(pMachine)
+    , m_pActionPool(m_pMachine->actionPool())
+    , m_comGuest(m_pMachine->uisession()->guest())
+    , m_strMachineName(m_pMachine->machineName())
 {
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.h

@@ -45 +45 @@
 /* Forward declarations: */
 class UIActionPool;
+class UIMachine;
 class UIGuestProcessControlDialog;
 class CGuest;
@@ -53 +54 @@
 public:
 
-    UIGuestProcessControlDialogFactory(UIActionPool *pActionPool = 0, const CGuest &comGuest = CGuest(), const QString &strMachineName = QString());
+    /** Constructs dialog factory.
+      * @param  pMachine  Brings the machine UI reference to be used by the created dialog. */
+    UIGuestProcessControlDialogFactory(UIMachine *pMachine = 0);
 
 protected:
@@ -61 +64 @@
     virtual void create(QIManagerDialog *&pDialog, QWidget *pCenterWidget) RT_OVERRIDE;
 
-    UIActionPool *m_pActionPool;
-    CGuest        m_comGuest;
-    QString       m_strMachineName;
+    /** Holds the machine UI reference. */
+    UIMachine *m_pMachine;
 };
 
@@ -75 +77 @@
 
     /** Constructs Guest Control dialog.
-      * @param  pCenterWidget  Passes the widget reference to center according to.
-      * @param  pActionPool    Passes the action-pool reference.
-      * @param  comGuest       Passes the com-guest reference. */
-    UIGuestProcessControlDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CGuest &comGuest, const QString &strMachineName = QString());
+      * @param  pMachine  Brings the machine UI reference to be used by the created dialog. */
+    UIGuestProcessControlDialog(QWidget *pCenterWidget, UIMachine *pMachine);
 
 protected:
@@ -115 +115 @@
 private:
 
+    UIMachine    *m_pMachine;
     UIActionPool *m_pActionPool;
-    CGuest      m_comGuest;
-    QString     m_strMachineName;
+    CGuest        m_comGuest;
+    QString       m_strMachineName;
 };
 

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

@@ -2467 +2467 @@
 
     QIManagerDialog *pProcessControlDialog;
-    UIGuestProcessControlDialogFactory dialogFactory(actionPool(), console().GetGuest(), machine().GetName());
+    UIGuestProcessControlDialogFactory dialogFactory(uimachine());
     dialogFactory.prepare(pProcessControlDialog, activeMachineWindow());
     if (pProcessControlDialog)