Changeset 83659 in vbox for trunk/src/VBox

Timestamp:

Apr 9, 2020 5:20:05 PM (5 years ago)

Author:

vboxsync

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

137126

Message:

FE/Qt: bugref:9653: Rename UITaskCloudAcquireInstances to UITaskCloudListMachines; We are migrating to CCloudMachine wrapper.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/manager/UITaskCloudListMachines.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.cpp ) (5 diffs)
• src/manager/UITaskCloudListMachines.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.h ) (6 diffs)
• src/manager/chooser/UIChooserAbstractModel.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -620 +620 @@
         src/hostnetwork/UIHostNetworkManager.h \
         src/manager/UIErrorPane.h \
-        src/manager/UITaskCloudAcquireInstances.h \
+        src/manager/UITaskCloudListMachines.h \
         src/manager/UITaskCloudRefreshMachineInfo.h \
         src/manager/UIToolPaneGlobal.h \
@@ -1071 +1071 @@
         src/hostnetwork/UIHostNetworkUtils.cpp \
         src/manager/UIErrorPane.cpp \
-        src/manager/UITaskCloudAcquireInstances.cpp \
+        src/manager/UITaskCloudListMachines.cpp \
         src/manager/UITaskCloudRefreshMachineInfo.cpp \
         src/manager/UIToolPaneGlobal.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UITaskCloudAcquireInstances class implementation.
+ * VBox Qt GUI - UITaskCloudListMachines class implementation.
  */
 
@@ -18 +18 @@
 /* GUI includes: */
 #include "UICloudNetworkingStuff.h"
-#include "UITaskCloudAcquireInstances.h"
+#include "UITaskCloudListMachines.h"
 
 
-UITaskCloudAcquireInstances::UITaskCloudAcquireInstances(const CCloudClient &comCloudClient, UIChooserNode *pParentNode)
+UITaskCloudListMachines::UITaskCloudListMachines(const CCloudClient &comCloudClient, UIChooserNode *pParentNode)
     : UITask(Type_CloudAcquireInstances)
     , m_comCloudClient(comCloudClient)
@@ -28 +28 @@
 }
 
-QVector<CCloudMachine> UITaskCloudAcquireInstances::result() const
+QVector<CCloudMachine> UITaskCloudListMachines::result() const
 {
     m_mutex.lock();
@@ -36 +36 @@
 }
 
-QString UITaskCloudAcquireInstances::errorInfo()
+QString UITaskCloudListMachines::errorInfo() const
 {
     m_mutex.lock();
@@ -44 +44 @@
 }
 
-void UITaskCloudAcquireInstances::run()
+void UITaskCloudListMachines::run()
 {
     m_mutex.lock();

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - UITaskCloudAcquireInstances class declaration.
+ * VBox Qt GUI - UITaskCloudListMachines class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_manager_UITaskCloudAcquireInstances_h
-#define FEQT_INCLUDED_SRC_manager_UITaskCloudAcquireInstances_h
+#ifndef FEQT_INCLUDED_SRC_manager_UITaskCloudListMachines_h
+#define FEQT_INCLUDED_SRC_manager_UITaskCloudListMachines_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -36 +36 @@
 class UIChooserNode;
 
-/** UITask extension used to load cloud instance list. */
-class UITaskCloudAcquireInstances : public UITask
+/** UITask extension used to list cloud machines. */
+class UITaskCloudListMachines : public UITask
 {
     Q_OBJECT;
@@ -46 +46 @@
       * @param  comCloudClient  Brings the cloud client object.
       * @param  m_pParentNode   Brings the parent node reference. */
-    UITaskCloudAcquireInstances(const CCloudClient &comCloudClient, UIChooserNode *pParentNode);
+    UITaskCloudListMachines(const CCloudClient &comCloudClient, UIChooserNode *pParentNode);
 
     /** Returns cloud client object. */
@@ -54 +54 @@
 
     /** Returns error info. */
-    QString errorInfo();
+    QString errorInfo() const;
 
     /** Returns the task result. */
@@ -81 +81 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_manager_UITaskCloudAcquireInstances_h */
+#endif /* !FEQT_INCLUDED_SRC_manager_UITaskCloudListMachines_h */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -29 +29 @@
 #include "UIVirtualMachineItem.h"
 #ifdef VBOX_GUI_WITH_CLOUD_VMS
-# include "UITaskCloudAcquireInstances.h"
+# include "UITaskCloudListMachines.h"
 # include "UIThreadPool.h"
 # include "UIVirtualMachineItemCloud.h"
@@ -274 +274 @@
 
     /* Cast task to corresponding sub-class: */
-    UITaskCloudAcquireInstances *pAcquiringTask = static_cast<UITaskCloudAcquireInstances*>(pTask);
+    UITaskCloudListMachines *pAcquiringTask = static_cast<UITaskCloudListMachines*>(pTask);
 
     /* Make sure there were no errors: */
@@ -494 +494 @@
 
                                     /* Create cloud acquire isntances task: */
-                                    UITaskCloudAcquireInstances *pTask = new UITaskCloudAcquireInstances(comCloudClient,
-                                                                                                         pProfileNode);
+                                    UITaskCloudListMachines *pTask = new UITaskCloudListMachines(comCloudClient,
+                                                                                                 pProfileNode);
                                     if (pTask)
                                     {