Changeset 73571 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 8, 2018 4:10:30 PM (6 years ago)

Author:

vboxsync

Message:

bugref:9152. Renamed ICloudUserProfiles to ICloudProvider, ICloudUserProfileManager to ICloudProviderManager. Commented out some code in the frontend. Sergey will rewrite it according to actual realization.

Location:

trunk/src/VBox/Main/include

Files:

• CloudUserProfileManagerImpl.h (modified) (2 diffs)
• CloudUserProfilesImpl.h (modified) (3 diffs)
• VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/include/CloudUserProfileManagerImpl.h

@@ -21 +21 @@
 
 /* VBox includes */
-#include "CloudUserProfileManagerWrap.h"
+#include "CloudProviderManagerWrap.h"
 #include "CloudUserProfilesImpl.h"
 
 /* VBox forward declarations */
 
-class ATL_NO_VTABLE CloudUserProfileManager
-    : public CloudUserProfileManagerWrap
+class ATL_NO_VTABLE CloudProviderManager
+    : public CloudProviderManagerWrap
 {
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR(CloudUserProfileManager)
+    DECLARE_EMPTY_CTOR_DTOR(CloudProviderManager)
 
     HRESULT FinalConstruct();
@@ -42 +42 @@
     ComPtr<VirtualBox> const mParent;       /**< Strong reference to the parent object (VirtualBox/IMachine). */
 #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
-    std::vector<ComPtr<ICloudUserProfileManager>> mUserProfileManagers;
+    std::vector<ComPtr<ICloudProviderManager>> mUserProfileManagers;
 #else
-    std::vector<CloudProviderId_T> mSupportedProviders;
+    std::vector<Utf8Str> mSupportedProviders;
 #endif
 
-    HRESULT getSupportedProviders(std::vector<CloudProviderId_T> &aProviderTypes);
-    HRESULT getAllProfiles(std::vector< ComPtr<ICloudUserProfiles> > &aProfilesList);
-    HRESULT getProfilesByProvider(CloudProviderId_T aProviderType, ComPtr<ICloudUserProfiles> &aProfiles);
+    HRESULT getSupportedProviders(std::vector<Utf8Str> &aProviderTypes);
+    HRESULT getAllProfiles(std::vector< ComPtr<ICloudProvider> > &aProfilesList);
+    HRESULT getProfilesByProvider(const com::Utf8Str &aProviderName, ComPtr<ICloudProvider> &aProfiles);
 };
 

trunk/src/VBox/Main/include/CloudUserProfilesImpl.h

@@ -25 +25 @@
 /* VBox includes */
 #include "CloudClientImpl.h"
-#include "CloudUserProfilesWrap.h"
+#include "CloudProviderWrap.h"
 #include "UnattendedScript.h"
 
@@ -31 +31 @@
 class SimpleConfigFile;
 
-class CloudUserProfiles : public CloudUserProfilesWrap
+class CloudProvider : public CloudProviderWrap
 {
 public:
-    CloudUserProfiles();
-    virtual ~CloudUserProfiles();
+    CloudProvider();
+    virtual ~CloudProvider();
     HRESULT FinalConstruct();
     void FinalRelease();
@@ -68 +68 @@
 
 class OCIUserProfiles :
-    public CloudUserProfiles
+    public CloudProvider
 {
 public:

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -313 +313 @@
     HRESULT createAppliance(ComPtr<IAppliance> &aAppliance);
     HRESULT createUnattendedInstaller(ComPtr<IUnattended> &aUnattended);
-    HRESULT createCloudUserProfileManager(ComPtr<ICloudUserProfileManager> &aManager);
+    HRESULT createCloudProviderManager(ComPtr<ICloudProviderManager> &aManager);
     HRESULT createMedium(const com::Utf8Str &aFormat,
                          const com::Utf8Str &aLocation,