Changeset 92744 in vbox for trunk/src/VBox

Timestamp:

Dec 3, 2021 6:48:20 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161. We don't need to pass CMachine reference to the logviewer. not anymore.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerDialog.cpp (modified) (5 diffs)
• logviewer/UIVMLogViewerDialog.h (modified) (4 diffs)
• logviewer/UIVMLogViewerWidget.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

@@ -45 +45 @@
 
 UIVMLogViewerDialogFactory::UIVMLogViewerDialogFactory(UIActionPool *pActionPool /* = 0 */,
-                                                       const CMachine &comMachine /* = CMachine() */)
+                                                       const QUuid &uMachineId /* = QUuid()*/,
+                                                       const QString &strMachineName /* = QString() */)
     : m_pActionPool(pActionPool)
-    , m_comMachine(comMachine)
+    , m_uMachineId(uMachineId)
+    , m_strMachineName(strMachineName)
 {
 }
@@ -53 +55 @@
 void UIVMLogViewerDialogFactory::create(QIManagerDialog *&pDialog, QWidget *pCenterWidget)
 {
-    pDialog = new UIVMLogViewerDialog(pCenterWidget, m_pActionPool, m_comMachine);
+    pDialog = new UIVMLogViewerDialog(pCenterWidget, m_pActionPool, m_uMachineId, m_strMachineName);
 }
 
@@ -61 +63 @@
 *********************************************************************************************************************************/
 
-UIVMLogViewerDialog::UIVMLogViewerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CMachine &comMachine)
+UIVMLogViewerDialog::UIVMLogViewerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool,
+                                         const QUuid &uMachineId /* = QUuid()*/,
+                                         const QString &strMachineName /* = QString() */)
     : QIWithRetranslateUI<QIManagerDialog>(pCenterWidget)
     , m_pActionPool(pActionPool)
-    , m_comMachine(comMachine)
+    , m_uMachineId(uMachineId)
     , m_iGeometrySaveTimerId(-1)
+    , m_strMachineName(strMachineName)
 {
 }
@@ -92 +97 @@
 {
     /* Translate window title: */
-    if (!m_comMachine.isNull())
-        setWindowTitle(tr("%1 - Log Viewer").arg(m_comMachine.GetName()));
+    if (!m_strMachineName.isEmpty())
+        setWindowTitle(tr("%1 - Log Viewer").arg(m_strMachineName));
     else
         setWindowTitle(UIVMLogViewerWidget::tr("Log Viewer"));
@@ -146 +151 @@
 {
     /* Create widget: */
-    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, m_pActionPool, true /* show toolbar */, m_comMachine, this);
-    /* Release the CMachine reference as we don't need it anymore. Doing it during dtor causes problems since xcom might be gone already: */
-    m_comMachine.detach();
+    UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, m_pActionPool, true /* show toolbar */, m_uMachineId, this);
     if (pWidget)
     {

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.h

@@ -51 +51 @@
     /** Constructs Log Viewer factory acquiring additional arguments.
       * @param  pActionPool  Brings the action-pool reference.
-      * @param  comMachine   Brings the machine for which VM Log-Viewer is requested. */
-    UIVMLogViewerDialogFactory(UIActionPool *pActionPool = 0, const CMachine &comMachine = CMachine());
+      * @param  uMachineId   Brings the machine id for which VM Log-Viewer is requested. */
+    UIVMLogViewerDialogFactory(UIActionPool *pActionPool = 0, const QUuid &uMachineId = QUuid(),
+                               const QString &strMachineName = QString());
 
 protected:
@@ -62 +63 @@
     /** Holds the action-pool reference. */
     UIActionPool *m_pActionPool;
-    /** Holds the machine reference. */
-    CMachine      m_comMachine;
+    /** Holds the machine id. */
+    QUuid      m_uMachineId;
+    QString    m_strMachineName;
 };
 
@@ -77 +79 @@
       * @param  pCenterWidget  Brings the widget reference to center according to.
       * @param  pActionPool    Brings the action-pool reference.
-      * @param  comMachine     Brings the machine reference. */
-    UIVMLogViewerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool, const CMachine &comMachine);
+      * @param  machine id     Brings the machine id. */
+    UIVMLogViewerDialog(QWidget *pCenterWidget, UIActionPool *pActionPool,
+                        const QUuid &uMachineId = QUuid(), const QString &strMachineName = QString());
     ~UIVMLogViewerDialog();
     void setSelectedVMListItems(const QList<UIVirtualMachineItem*> &items);
@@ -123 +126 @@
     /** Holds the action-pool reference. */
     UIActionPool *m_pActionPool;
-    /** Holds the machine reference. */
-    CMachine      m_comMachine;
+    /** Holds the machine id. */
+    QUuid      m_uMachineId;
     int m_iGeometrySaveTimerId;
+    QString    m_strMachineName;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -191 +191 @@
                                          UIActionPool *pActionPool,
                                          bool fShowToolbar /* = true */,
-                                         const CMachine &comMachine /* = CMachine() */,
+                                         const QUuid &uMachineId /* = QUuid() */,
                                          QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
@@ -215 +215 @@
     prepare();
     restorePanelVisibility();
-    if (!comMachine.isNull())
-        setMachines(QVector<QUuid>(1, comMachine.GetId()));
+    if (!uMachineId.isNull())
+        setMachines(QVector<QUuid>() << uMachineId);
     connect(&uiCommon(), &UICommon::sigAskToCommitData,
             this, &UIVMLogViewerWidget::sltCommitDataSignalReceived);

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -73 +73 @@
       * @param  pActionPool   Brings the action-pool reference.
       * @param  fShowToolbar  Brings whether we should create/show toolbar.
-      * @param  comMachine    Brings the machine for which VM Log-Viewer is requested. */
+      * @param  uMachineId    Brings the machine id for which VM Log-Viewer is requested. */
     UIVMLogViewerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
-                        bool fShowToolbar = true, const CMachine &comMachine = CMachine(), QWidget *pParent = 0);
+                        bool fShowToolbar = true, const QUuid &uMachineId = QUuid(), QWidget *pParent = 0);
     ~UIVMLogViewerWidget();
     /** Returns the width of the current log page. return 0 if there is no current log page: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1884 +1884 @@
     if (!m_pLogViewerDialog)
     {
-        UIVMLogViewerDialogFactory dialogFactory(actionPool(), CMachine());
+        UIVMLogViewerDialogFactory dialogFactory(actionPool(), QUuid());
         dialogFactory.prepare(m_pLogViewerDialog, this);
         if (m_pLogViewerDialog)

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

@@ -2483 +2483 @@
 
     QIManagerDialog *pLogViewerDialog;
-    UIVMLogViewerDialogFactory dialogFactory(actionPool(), machine());
+    UIVMLogViewerDialogFactory dialogFactory(actionPool(), machine().GetId(), machine().GetName());
     dialogFactory.prepare(pLogViewerDialog, activeMachineWindow());
     if (pLogViewerDialog)