Index: /trunk/include/VBox/log.h =================================================================== --- /trunk/include/VBox/log.h (revision 73570) +++ /trunk/include/VBox/log.h (revision 73571) @@ -362,8 +362,8 @@ /** Main group, ICloudClient. */ LOG_GROUP_MAIN_CLOUDCLIENT, - /** Main group, ICloudUserProfileManager. */ - LOG_GROUP_MAIN_CLOUDUSERPROFILEMANAGER, - /** Main group, ICloudUserProfiles. */ - LOG_GROUP_MAIN_CLOUDUSERPROFILES, + /** Main group, ICloudProvider. */ + LOG_GROUP_MAIN_CLOUDPROVIDER, + /** Main group, ICloudProviderManager. */ + LOG_GROUP_MAIN_CLOUDPROVIDERMANAGER, /** Main group, IConsole. */ LOG_GROUP_MAIN_CONSOLE, @@ -998,6 +998,6 @@ "MAIN_CLIPBOARDMODECHANGEDEVENT", \ "MAIN_CLOUDCLIENT", \ - "MAIN_CLOUDUSERPROFILEMANAGER", \ - "MAIN_CLOUDUSERPROFILES", \ + "MAIN_CLOUDPROVIDER", \ + "MAIN_CLOUDPROVIDERMANAGER", \ "MAIN_CONSOLE", \ "MAIN_CPUCHANGEDEVENT", \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (revision 73570) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (revision 73571) @@ -27,6 +27,6 @@ /* COM includes: */ #include "COMEnums.h" -#include "CCloudUserProfiles.h" -#include "CCloudUserProfileManager.h" +#include "CCloudProvider.h" +#include "CCloudProviderManager.h" /* Forward declarations: */ @@ -128,14 +128,15 @@ void setProvider(KCloudProviderId enmProvider); /** Returns provider. */ - KCloudProviderId provider() const; +// KCloudProviderId provider() const; + QString provider() const; /** Returns profile. */ QString profile() const; /** Returns Cloud User-profile object. */ - CCloudUserProfiles profiles() const; + CCloudProvider profiles() const; /** Holds the Cloud User-profile Manager reference. */ - CCloudUserProfileManager m_comCloudUserProfileManager; + CCloudProviderManager m_comCloudProviderManager; /** Holds the Cloud User-profile object reference. */ - CCloudUserProfiles m_comCloudUserProfiles; + CCloudProvider m_comCloudProvider; /** Holds the default appliance name. */ @@ -197,5 +198,5 @@ Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected); Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected); - Q_PROPERTY(CCloudUserProfiles profiles READ profiles); + Q_PROPERTY(CCloudProvider profiles READ profiles); Q_PROPERTY(QString profile READ profile); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 73570) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 73571) @@ -38,5 +38,5 @@ # include "CAppliance.h" # include "CCloudClient.h" -# include "CCloudUserProfiles.h" +# include "CCloudProvider.h" # include "CMachine.h" @@ -58,11 +58,11 @@ /* Acquire Cloud User-profiles: */ - CCloudUserProfiles comCloudUserProfiles = fieldImp("profiles").value(); - AssertMsgReturnVoid(comCloudUserProfiles.isNotNull(), - ("Cloud User-profiles object is undefined!")); + CCloudProvider comCloudProvider = fieldImp("profiles").value(); + AssertMsgReturnVoid(comCloudProvider.isNotNull(), + ("Cloud provider object is undefined!")); /* Create Cloud Client: */ - CCloudClient comCloudClient = comCloudUserProfiles.CreateCloudClient(fieldImp("profile").toString()); - AssertMsgReturnVoid(comCloudUserProfiles.isOk() && comCloudClient.isNotNull(), + CCloudClient comCloudClient = comCloudProvider.CreateCloudClient(fieldImp("profile").toString()); + AssertMsgReturnVoid(comCloudProvider.isOk() && comCloudClient.isNotNull(), ("Can't create Cloud Client object!")); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 73570) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 73571) @@ -41,5 +41,5 @@ Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected); Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected); - Q_PROPERTY(CCloudUserProfiles profiles READ profiles); + Q_PROPERTY(CCloudProvider profiles READ profiles); Q_PROPERTY(QString profile READ profile); Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget); Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 73570) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 73571) @@ -2451,9 +2451,9 @@ - - - Creates a new cloud user profile manager object - - + + + Creates a new cloud provider manager object + + New cloud user profile manager @@ -25107,17 +25107,13 @@ - - Cloud user profiles description - - @@ -25225,17 +25221,14 @@ - - Cloud User Profile Manager description - - - + + Returns a predefined list of all supported cloud providers. @@ -25243,8 +25236,8 @@ - Returns the list of the ICloudUserProfiles in one call. - - - Returns the list of ICloudUserProfiles. + Returns the list of the ICloudProvider in one call. + + + Returns the list of ICloudProvider. @@ -25252,10 +25245,10 @@ - Returns the ICloudUserProfiles for the particular provider. - - - - - Returns the ICloudUserProfiles. + Returns the ICloudProvider for the particular provider. + + + + + Returns the ICloudProvider. Index: /trunk/src/VBox/Main/include/CloudUserProfileManagerImpl.h =================================================================== --- /trunk/src/VBox/Main/include/CloudUserProfileManagerImpl.h (revision 73570) +++ /trunk/src/VBox/Main/include/CloudUserProfileManagerImpl.h (revision 73571) @@ -21,15 +21,15 @@ /* 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,12 +42,12 @@ ComPtr const mParent; /**< Strong reference to the parent object (VirtualBox/IMachine). */ #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK - std::vector> mUserProfileManagers; + std::vector> mUserProfileManagers; #else - std::vector mSupportedProviders; + std::vector mSupportedProviders; #endif - HRESULT getSupportedProviders(std::vector &aProviderTypes); - HRESULT getAllProfiles(std::vector< ComPtr > &aProfilesList); - HRESULT getProfilesByProvider(CloudProviderId_T aProviderType, ComPtr &aProfiles); + HRESULT getSupportedProviders(std::vector &aProviderTypes); + HRESULT getAllProfiles(std::vector< ComPtr > &aProfilesList); + HRESULT getProfilesByProvider(const com::Utf8Str &aProviderName, ComPtr &aProfiles); }; Index: /trunk/src/VBox/Main/include/CloudUserProfilesImpl.h =================================================================== --- /trunk/src/VBox/Main/include/CloudUserProfilesImpl.h (revision 73570) +++ /trunk/src/VBox/Main/include/CloudUserProfilesImpl.h (revision 73571) @@ -25,5 +25,5 @@ /* VBox includes */ #include "CloudClientImpl.h" -#include "CloudUserProfilesWrap.h" +#include "CloudProviderWrap.h" #include "UnattendedScript.h" @@ -31,9 +31,9 @@ class SimpleConfigFile; -class CloudUserProfiles : public CloudUserProfilesWrap +class CloudProvider : public CloudProviderWrap { public: - CloudUserProfiles(); - virtual ~CloudUserProfiles(); + CloudProvider(); + virtual ~CloudProvider(); HRESULT FinalConstruct(); void FinalRelease(); @@ -68,5 +68,5 @@ class OCIUserProfiles : - public CloudUserProfiles + public CloudProvider { public: Index: /trunk/src/VBox/Main/include/VirtualBoxImpl.h =================================================================== --- /trunk/src/VBox/Main/include/VirtualBoxImpl.h (revision 73570) +++ /trunk/src/VBox/Main/include/VirtualBoxImpl.h (revision 73571) @@ -313,5 +313,5 @@ HRESULT createAppliance(ComPtr &aAppliance); HRESULT createUnattendedInstaller(ComPtr &aUnattended); - HRESULT createCloudUserProfileManager(ComPtr &aManager); + HRESULT createCloudProviderManager(ComPtr &aManager); HRESULT createMedium(const com::Utf8Str &aFormat, const com::Utf8Str &aLocation, Index: /trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp (revision 73570) +++ /trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp (revision 73571) @@ -1,5 +1,5 @@ /* $Id$ */ /** @file - * ICloudUserProfileManager COM class implementations. + * ICloudProviderManager COM class implementations. */ @@ -36,23 +36,23 @@ //////////////////////////////////////////////////////////////////////////////// // -// CloudUserProfileManager constructor / destructor +// CloudProviderManager constructor / destructor // // //////////////////////////////////////////////////////////////////////////////// -CloudUserProfileManager::CloudUserProfileManager() +CloudProviderManager::CloudProviderManager() : mParent(NULL) { } -CloudUserProfileManager::~CloudUserProfileManager() -{ -} - - -HRESULT CloudUserProfileManager::FinalConstruct() +CloudProviderManager::~CloudProviderManager() +{ +} + + +HRESULT CloudProviderManager::FinalConstruct() { return BaseFinalConstruct(); } -void CloudUserProfileManager::FinalRelease() +void CloudProviderManager::FinalRelease() { uninit(); @@ -61,5 +61,5 @@ } -HRESULT CloudUserProfileManager::init(VirtualBox *aParent) +HRESULT CloudProviderManager::init(VirtualBox *aParent) { /* Enclose the state transition NotReady->InInit->Ready */ @@ -75,9 +75,9 @@ ExtPackManager *pExtPackMgr = aParent->i_getExtPackManager(); std::vector > Objects; - com::Guid idObj(COM_IIDOF(ICloudUserProfileManager)); + com::Guid idObj(COM_IIDOF(ICloudProviderManager)); pExtPackMgr->i_queryObjects(idObj.toString(), Objects); for (unsigned i = 0; i < Objects.size(); i++) { - ComPtr ptrTmp; + ComPtr ptrTmp; HRESULT hrc = Objects[i].queryInterfaceTo(ptrTmp.asOutParam()); if (SUCCEEDED(hrc)) @@ -87,5 +87,6 @@ mSupportedProviders.clear(); - mSupportedProviders.push_back(CloudProviderId_OCI); + mSupportedProviders.push_back("OCI"); + #endif @@ -94,5 +95,5 @@ } -void CloudUserProfileManager::uninit() +void CloudProviderManager::uninit() { /* Enclose the state transition Ready->InUninit->NotReady */ @@ -104,5 +105,5 @@ } -HRESULT CloudUserProfileManager::getSupportedProviders(std::vector &aSupportedProviders) +HRESULT CloudProviderManager::getSupportedProviders(std::vector &aSupportedProviders) { #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK @@ -113,5 +114,5 @@ for (unsigned i = 0; i < mUserProfileManagers.size(); i++) { - SafeArray FromCurrent; + SafeArray FromCurrent; HRESULT hrc2 = mUserProfileManagers[i]->COMGETTER(SupportedProviders)(ComSafeArrayAsOutParam(FromCurrent)); if (SUCCEEDED(hrc2)) @@ -130,5 +131,5 @@ } -HRESULT CloudUserProfileManager::getAllProfiles(std::vector > &aProfilesList) +HRESULT CloudProviderManager::getAllProfiles(std::vector > &aProfilesList) { #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK @@ -139,5 +140,5 @@ for (unsigned i = 0; i < mUserProfileManagers.size(); i++) { - SafeIfaceArray FromCurrent; + SafeIfaceArray FromCurrent; HRESULT hrc2 = mUserProfileManagers[i]->GetAllProfiles(ComSafeArrayAsOutParam(FromCurrent)); if (SUCCEEDED(hrc2)) @@ -153,8 +154,8 @@ #else HRESULT hrc = S_OK; - std::vector > lProfilesList; + std::vector > lProfilesList; for (size_t i=0;i lProfiles; + ComPtr lProfiles; hrc = getProfilesByProvider(mSupportedProviders.at(i), lProfiles); if (FAILED(hrc)) @@ -171,6 +172,6 @@ } -HRESULT CloudUserProfileManager::getProfilesByProvider(CloudProviderId_T aProviderType, - ComPtr &aProfiles) +HRESULT CloudProviderManager::getProfilesByProvider(const com::Utf8Str &aProviderName, + ComPtr &aProfiles) { #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK @@ -189,50 +190,47 @@ #else - ComObjPtr ptrCloudUserProfiles; - HRESULT hrc = ptrCloudUserProfiles.createObject(); - switch(aProviderType) - { - case CloudProviderId_OCI: - default: - ComObjPtr ptrOCIUserProfiles; - hrc = ptrOCIUserProfiles.createObject(); + ComObjPtr ptrCloudProvider; + HRESULT hrc = ptrCloudProvider.createObject(); + if (aProviderName.equals("OCI")) + { + ComObjPtr ptrOCIUserProfiles; + hrc = ptrOCIUserProfiles.createObject(); + if (SUCCEEDED(hrc)) + { + AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS); + + hrc = ptrOCIUserProfiles->init(mParent); if (SUCCEEDED(hrc)) { - AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS); - - hrc = ptrOCIUserProfiles->init(mParent); - if (SUCCEEDED(hrc)) + char szOciConfigPath[RTPATH_MAX]; + int vrc = RTPathUserHome(szOciConfigPath, sizeof(szOciConfigPath)); + if (RT_SUCCESS(vrc)) + vrc = RTPathAppend(szOciConfigPath, sizeof(szOciConfigPath), ".oci" RTPATH_SLASH_STR "config"); + if (RT_SUCCESS(vrc)) { - char szOciConfigPath[RTPATH_MAX]; - int vrc = RTPathUserHome(szOciConfigPath, sizeof(szOciConfigPath)); - if (RT_SUCCESS(vrc)) - vrc = RTPathAppend(szOciConfigPath, sizeof(szOciConfigPath), ".oci" RTPATH_SLASH_STR "config"); - if (RT_SUCCESS(vrc)) + LogRel(("config = %s\n", szOciConfigPath)); + if (RTFileExists(szOciConfigPath)) { - LogRel(("config = %s\n", szOciConfigPath)); - if (RTFileExists(szOciConfigPath)) - { - hrc = ptrOCIUserProfiles->readProfiles(szOciConfigPath); - if (SUCCEEDED(hrc)) - LogRel(("Reading profiles from %s has been done\n", szOciConfigPath)); - else - LogRel(("Reading profiles from %s hasn't been done\n", szOciConfigPath)); - - ptrCloudUserProfiles = ptrOCIUserProfiles; - hrc = ptrCloudUserProfiles.queryInterfaceTo(aProfiles.asOutParam()); - } + hrc = ptrOCIUserProfiles->readProfiles(szOciConfigPath); + if (SUCCEEDED(hrc)) + LogRel(("Reading profiles from %s has been done\n", szOciConfigPath)); else - hrc = setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the config file '%s'"), - szOciConfigPath); + LogRel(("Reading profiles from %s hasn't been done\n", szOciConfigPath)); + + ptrCloudProvider = ptrOCIUserProfiles; + hrc = ptrCloudProvider.queryInterfaceTo(aProfiles.asOutParam()); } else - hrc = setErrorVrc(vrc); + hrc = setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the config file '%s'"), + szOciConfigPath); } + else + hrc = setErrorVrc(vrc); } - break; - } - - return hrc; -#endif -} - + } + } + + return hrc; +#endif +} + Index: /trunk/src/VBox/Main/src-server/CloudUserProfilesImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/CloudUserProfilesImpl.cpp (revision 73570) +++ /trunk/src/VBox/Main/src-server/CloudUserProfilesImpl.cpp (revision 73571) @@ -1,5 +1,5 @@ /* $Id$ */ /** @file - * ICloudUserProfiles COM class implementations. + * ICloudProvider COM class implementations. */ @@ -210,24 +210,24 @@ //////////////////////////////////////////////////////////////////////////////// // -// ICloudUserProfiles implementation +// ICloudProvider implementation // //////////////////////////////////////////////////////////////////////////////// -CloudUserProfiles::CloudUserProfiles() +CloudProvider::CloudProvider() : mParent(NULL) { } -CloudUserProfiles::~CloudUserProfiles() -{ - LogRel(("CloudUserProfilesImpl::~CloudUserProfilesImpl()\n")); +CloudProvider::~CloudProvider() +{ + LogRel(("CloudProvider::~CloudProvider()\n")); unconst(mParent) = NULL; } -HRESULT CloudUserProfiles::FinalConstruct() +HRESULT CloudProvider::FinalConstruct() { return BaseFinalConstruct(); } -void CloudUserProfiles::FinalRelease() +void CloudProvider::FinalRelease() { uninit(); @@ -236,5 +236,5 @@ } -void CloudUserProfiles::uninit() +void CloudProvider::uninit() { /* Enclose the state transition Ready->InUninit->NotReady */ @@ -246,5 +246,5 @@ } -HRESULT CloudUserProfiles::init(VirtualBox *aParent) +HRESULT CloudProvider::init(VirtualBox *aParent) { /* Enclose the state transition NotReady->InInit->Ready */ @@ -259,53 +259,53 @@ -HRESULT CloudUserProfiles::getSupportedPropertiesNames(std::vector &aPropertiesNames) -{ - LogRel(("CloudUserProfiles::getSupportedPropertiesNames:\n")); +HRESULT CloudProvider::getSupportedPropertiesNames(std::vector &aPropertiesNames) +{ + LogRel(("CloudProvider::getSupportedPropertiesNames:\n")); aPropertiesNames.clear(); return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); } -HRESULT CloudUserProfiles::readProfiles(const Utf8Str &strConfigPath) -{ - LogRel(("CloudUserProfiles::readProfiles: %s\n", strConfigPath.c_str())); - return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); -} - -HRESULT CloudUserProfiles::getProvider(CloudProviderId_T *aProvider) +HRESULT CloudProvider::readProfiles(const Utf8Str &strConfigPath) +{ + LogRel(("CloudProvider::readProfiles: %s\n", strConfigPath.c_str())); + return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); +} + +HRESULT CloudProvider::getProvider(CloudProviderId_T *aProvider) { *aProvider = CloudProviderId_Unknown; - LogRel(("CloudUserProfiles::getProvider: %d\n", *aProvider)); - return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); -} - -HRESULT CloudUserProfiles::createProfile(const com::Utf8Str &aProfileName, + LogRel(("CloudProvider::getProvider: %d\n", *aProvider)); + return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); +} + +HRESULT CloudProvider::createProfile(const com::Utf8Str &aProfileName, const std::vector &aNames, const std::vector &aValues) { - LogRel(("CloudUserProfiles::createProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size())); - return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); -} - -HRESULT CloudUserProfiles::updateProfile(const com::Utf8Str &aProfileName, + LogRel(("CloudProvider::createProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size())); + return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); +} + +HRESULT CloudProvider::updateProfile(const com::Utf8Str &aProfileName, const std::vector &aNames, const std::vector &aValues) { - LogRel(("CloudUserProfiles::updateProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size())); - return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); -} - -HRESULT CloudUserProfiles::getStoredProfilesNames(std::vector &aProfilesNames) -{ - - LogRel(("CloudUserProfiles::getStoredProfilesNames:\n")); + LogRel(("CloudProvider::updateProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size())); + return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); +} + +HRESULT CloudProvider::getStoredProfilesNames(std::vector &aProfilesNames) +{ + + LogRel(("CloudProvider::getStoredProfilesNames:\n")); aProfilesNames.clear(); return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); } -HRESULT CloudUserProfiles::getProfileProperties(const com::Utf8Str &aProfileName, +HRESULT CloudProvider::getProfileProperties(const com::Utf8Str &aProfileName, std::vector &aReturnNames, std::vector &aReturnValues) { - LogRel(("CloudUserProfiles::getProfileProperties: %s\n", aProfileName.c_str())); + LogRel(("CloudProvider::getProfileProperties: %s\n", aProfileName.c_str())); aReturnNames.clear(); aReturnValues.clear(); @@ -313,15 +313,15 @@ } -HRESULT CloudUserProfiles::getPropertyDescription(const com::Utf8Str &aName, +HRESULT CloudProvider::getPropertyDescription(const com::Utf8Str &aName, com::Utf8Str &aDescription) { - LogRel(("CloudUserProfiles::getPropertyDescription: %s, %s\n", aName.c_str(), aDescription.c_str())); - return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); -} - -HRESULT CloudUserProfiles::createCloudClient(const com::Utf8Str &aProfileName, + LogRel(("CloudProvider::getPropertyDescription: %s, %s\n", aName.c_str(), aDescription.c_str())); + return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented")); +} + +HRESULT CloudProvider::createCloudClient(const com::Utf8Str &aProfileName, ComPtr &aCloudClient) { - LogRel(("CloudUserProfiles::createCloudClient: %s\n", aProfileName.c_str())); + LogRel(("CloudProvider::createCloudClient: %s\n", aProfileName.c_str())); if (aCloudClient.isNull()) Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (revision 73570) +++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (revision 73571) @@ -1820,14 +1820,14 @@ } -HRESULT VirtualBox::createCloudUserProfileManager(ComPtr &aManager) -{ - ComObjPtr ptrCloudUserProfileManager; - HRESULT hrc = ptrCloudUserProfileManager.createObject(); +HRESULT VirtualBox::createCloudProviderManager(ComPtr &aManager) +{ + ComObjPtr ptrCloudProviderManager; + HRESULT hrc = ptrCloudProviderManager.createObject(); if (SUCCEEDED(hrc)) { AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS); - hrc = ptrCloudUserProfileManager->init(this); + hrc = ptrCloudProviderManager->init(this); if (SUCCEEDED(hrc)) - hrc = ptrCloudUserProfileManager.queryInterfaceTo(aManager.asOutParam()); + hrc = ptrCloudProviderManager.queryInterfaceTo(aManager.asOutParam()); } return hrc;