Changeset 84059 in vbox

Timestamp:

Apr 28, 2020 4:54:35 PM (5 years ago)

Author:

vboxsync

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

137638

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Remove some of VBOX_GUI_WITH_CLOUD_VMS usages, to make corresponding code compile as well.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (3 diffs)
• UIChooserAbstractModel.h (modified) (3 diffs)
• UIChooserModel.cpp (modified) (2 diffs)
• UIChooserModel.h (modified) (2 diffs)

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

@@ -27 +27 @@
 #include "UIExtraDataManager.h"
 #include "UIMessageCenter.h"
+#include "UITaskCloudListMachines.h"
+#include "UIThreadPool.h"
 #include "UIVirtualBoxEventHandler.h"
 #include "UIVirtualMachineItemCloud.h"
-#ifdef VBOX_GUI_WITH_CLOUD_VMS
-# include "UITaskCloudListMachines.h"
-# include "UIThreadPool.h"
-#endif
 
 /* COM includes: */
+#include "CCloudMachine.h"
+#include "CCloudProfile.h"
+#include "CCloudProvider.h"
 #include "CMachine.h"
-#ifdef VBOX_GUI_WITH_CLOUD_VMS
-# include "CCloudClient.h"
-# include "CCloudMachine.h"
-# include "CCloudProfile.h"
-# include "CCloudProvider.h"
-# include "CCloudProviderManager.h"
-#endif
 
 /* Type defs: */
@@ -443 +437 @@
 }
 
-#ifdef VBOX_GUI_WITH_CLOUD_VMS
 void UIChooserAbstractModel::sltHandleCloudListMachinesTaskComplete(UITask *pTask)
 {
@@ -493 +486 @@
     }
 }
-#endif /* VBOX_GUI_WITH_CLOUD_VMS */
 
 void UIChooserAbstractModel::sltHandleCloudMachineStateChange()

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

@@ -35 +35 @@
 class UIChooser;
 class UIChooserNode;
+class UITask;
 class CCloudMachine;
 class CMachine;
-#ifdef VBOX_GUI_WITH_CLOUD_VMS
-class UITask;
-#endif
 
 
@@ -156 +154 @@
     /** @} */
 
-#ifdef VBOX_GUI_WITH_CLOUD_VMS
     /** @name Cloud stuff.
       * @{ */
@@ -162 +159 @@
         virtual void sltHandleCloudListMachinesTaskComplete(UITask *pTask);
     /** @} */
-#endif /* VBOX_GUI_WITH_CLOUD_VMS */
 
 private slots:

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

@@ -744 +744 @@
 }
 
-#ifdef VBOX_GUI_WITH_CLOUD_VMS
 void UIChooserModel::sltHandleCloudListMachinesTaskComplete(UITask *pTask)
 {
@@ -767 +766 @@
         makeSureAtLeastOneItemSelected();
 }
-#endif /* VBOX_GUI_WITH_CLOUD_VMS */
 
 void UIChooserModel::sltMakeSureCurrentItemVisible()

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -264 +264 @@
     /** @} */
 
-#ifdef VBOX_GUI_WITH_CLOUD_VMS
     /** @name Cloud stuff.
       * @{ */
@@ -270 +269 @@
         virtual void sltHandleCloudListMachinesTaskComplete(UITask *pTask) /* override */;
     /** @} */
-#endif /* VBOX_GUI_WITH_CLOUD_VMS */
 
 private slots: