Changeset 83147 in vbox

Timestamp:

Feb 25, 2020 11:39:17 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Rework UIVirtualMachineItemCloud to use UICloudMachine directly s wrapper instead of pointer.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualMachineItemCloud.cpp (modified) (8 diffs)
• UIVirtualMachineItemCloud.h (modified) (3 diffs)

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

@@ -20 +20 @@
 
 /* GUI includes: */
-#include "UICloudMachine.h"
 #include "UICloudNetworkingStuff.h"
 #include "UICommon.h"
@@ -36 +35 @@
 UIVirtualMachineItemCloud::UIVirtualMachineItemCloud()
     : UIVirtualMachineItem(ItemType_CloudFake)
-    , m_pCloudMachine(0)
     , m_enmFakeCloudItemState(FakeCloudItemState_Loading)
     , m_pTask(0)
@@ -45 +43 @@
 UIVirtualMachineItemCloud::UIVirtualMachineItemCloud(const UICloudMachine &guiCloudMachine)
     : UIVirtualMachineItem(ItemType_CloudReal)
-    , m_pCloudMachine(new UICloudMachine(guiCloudMachine))
+    , m_guiCloudMachine(guiCloudMachine)
     , m_enmFakeCloudItemState(FakeCloudItemState_NotApplicable)
     , m_pTask(0)
@@ -54 +52 @@
 UIVirtualMachineItemCloud::~UIVirtualMachineItemCloud()
 {
-    delete m_pCloudMachine;
 }
 
@@ -61 +58 @@
     /* Make sure item is of real cloud type and is initialized: */
     AssertReturnVoid(itemType() == ItemType_CloudReal);
-    AssertPtrReturnVoid(m_pCloudMachine);
 
     /* Acquire info: */
-    const QMap<KVirtualSystemDescriptionType, QString> infoMap = getInstanceInfo(m_pCloudMachine->client(),
+    const QMap<KVirtualSystemDescriptionType, QString> infoMap = getInstanceInfo(m_guiCloudMachine.client(),
                                                                                  m_strId,
                                                                                  pParent);
@@ -90 +86 @@
 {
     /* Acquire cloud client: */
-    CCloudClient comCloudClient = m_pCloudMachine->client();
+    CCloudClient comCloudClient = m_guiCloudMachine.client();
 
     /* Now execute async method: */
@@ -122 +118 @@
     if (itemType() == ItemType_CloudReal)
     {
-        AssertPtrReturnVoid(m_pCloudMachine);
-        m_strId = m_pCloudMachine->id();
-        m_strName = m_pCloudMachine->name();
+        m_strId = m_guiCloudMachine.id();
+        m_strName = m_guiCloudMachine.name();
     }
 
@@ -301 +296 @@
     /* Make sure item is of real cloud type and is initialized: */
     AssertReturnVoid(itemType() == ItemType_CloudReal);
-    AssertPtrReturnVoid(m_pCloudMachine);
 
     /* Create and start task to acquire info async way only if there is no task yet: */
     if (!m_pTask)
     {
-        m_pTask = new UITaskCloudGetInstanceInfo(m_pCloudMachine->client(), m_strId);
+        m_pTask = new UITaskCloudGetInstanceInfo(m_guiCloudMachine.client(), m_strId);
         connect(m_pTask, &UITask::sigComplete,
                 this, &UIVirtualMachineItemCloud::sltHandleGetCloudInstanceInfoDone);

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h

@@ -23 +23 @@
 
 /* GUI includes: */
+#include "UICloudMachine.h"
 #include "UIVirtualMachineItem.h"
 
 /* Forward declarations: */
-class UICloudMachine;
 class UITask;
 
@@ -55 +55 @@
     /** Destructs cloud VM item. */
     virtual ~UIVirtualMachineItemCloud();
+
+    /** @name Arguments.
+      * @{ */
+        /** Returns cached cloud VM object. */
+        UICloudMachine machine() const { return m_guiCloudMachine; }
+    /** @} */
 
     /** @name Data attributes.
@@ -140 +146 @@
     /** @name Arguments.
       * @{ */
-        /** Holds cached cloud machine object reference. */
-        UICloudMachine *m_pCloudMachine;
+        /** Holds cached cloud VM object reference. */
+        UICloudMachine  m_guiCloudMachine;
     /** @} */