VirtualBox

Changeset 73337 in vbox


Ignore:
Timestamp:
Jul 23, 2018 10:05:26 PM (7 years ago)
Author:
vboxsync
Message:

bugref:9152. Renamed CloudUserProfileList to CloudUserProfiles.

Location:
trunk
Files:
11 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/log.h

    r73154 r73337  
    362362    /** Main group, ICloudClient. */
    363363    LOG_GROUP_MAIN_CLOUDCLIENT,
    364     /** Main group, ICloudUserProfileList. */
    365     LOG_GROUP_MAIN_CLOUDUSERPROFILELIST,
    366364    /** Main group, ICloudUserProfileManager. */
    367365    LOG_GROUP_MAIN_CLOUDUSERPROFILEMANAGER,
     366    /** Main group, ICloudUserProfiles. */
     367    LOG_GROUP_MAIN_CLOUDUSERPROFILES,
    368368    /** Main group, IConsole. */
    369369    LOG_GROUP_MAIN_CONSOLE,
    … …  
    998998    "MAIN_CLIPBOARDMODECHANGEDEVENT", \
    999999    "MAIN_CLOUDCLIENT", \
    1000     "MAIN_CLOUDUSERPROFILELIST", \
    10011000    "MAIN_CLOUDUSERPROFILEMANAGER", \
     1001    "MAIN_CLOUDUSERPROFILES", \
    10021002    "MAIN_CONSOLE", \
    10031003    "MAIN_CPUCHANGEDEVENT", \

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

    r73329 r73337  
    4040# include "UIWizardExportAppDefs.h"
    4141# include "UIWizardExportAppPageBasic3.h"
     42
     43/* COM includes: */
     44# include "CCloudUserProfiles.h"
    4245
    4346#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
    … …  
    123126    {
    124127        /* Acquire Cloud User-profile List: */
    125         CCloudUserProfileList comProfiles = m_comCloudUserProfileManager.GetProfilesByProvider(enmType);
     128        CCloudUserProfiles comProfiles = m_comCloudUserProfileManager.GetProfilesByProvider(enmType);
    126129        /* Skip if we have nothing to populate (file missing?): */
    127130        if (comProfiles.isNull())
    … …  
    431434}
    432435
    433 CCloudUserProfileList UIWizardExportAppPage3::profiles() const
     436CCloudUserProfiles UIWizardExportAppPage3::profiles() const
    434437{
    435438    return m_comCloudUserProfiles;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h

    r73316 r73337  
    2727/* COM includes: */
    2828#include "COMEnums.h"
    29 #include "CCloudUserProfileList.h"
     29#include "CCloudUserProfiles.h"
    3030#include "CCloudUserProfileManager.h"
    3131
    … …  
    132132    QString profile() const;
    133133    /** Returns Cloud User-profile object. */
    134     CCloudUserProfileList profiles() const;
     134    CCloudUserProfiles profiles() const;
    135135
    136136    /** Holds the Cloud User-profile Manager reference. */
    137137    CCloudUserProfileManager  m_comCloudUserProfileManager;
    138138    /** Holds the Cloud User-profile object reference. */
    139     CCloudUserProfileList     m_comCloudUserProfiles;
     139    CCloudUserProfiles     m_comCloudUserProfiles;
    140140
    141141    /** Holds the default appliance name. */
    … …  
    197197    Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
    198198    Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
    199     Q_PROPERTY(CCloudUserProfileList profiles READ profiles);
     199    Q_PROPERTY(CCloudUserProfiles profiles READ profiles);
    200200    Q_PROPERTY(QString profile READ profile);
    201201

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic4.cpp

    r73326 r73337  
    3838# include "CAppliance.h"
    3939# include "CCloudClient.h"
    40 # include "CCloudUserProfileList.h"
     40# include "CCloudUserProfiles.h"
    4141# include "CMachine.h"
    4242
    … …  
    5858
    5959    /* Acquire Cloud User-profiles: */
    60     CCloudUserProfileList comCloudUserProfiles = fieldImp("profiles").value<CCloudUserProfileList>();
     60    CCloudUserProfiles comCloudUserProfiles = fieldImp("profiles").value<CCloudUserProfiles>();
    6161    AssertMsgReturnVoid(comCloudUserProfiles.isNotNull(),
    6262                        ("Cloud User-profiles object is undefined!"));

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

    r73317 r73337  
    4646    Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
    4747    Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
    48     Q_PROPERTY(CCloudUserProfileList profiles READ profiles);
     48    Q_PROPERTY(CCloudUserProfiles profiles READ profiles);
    4949    Q_PROPERTY(QString profile READ profile);
    5050    Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);

  • trunk/src/VBox/Main/Makefile.kmk

    r73154 r73337  
    456456        src-server/ClientToken.cpp \
    457457        src-server/CloudClientImpl.cpp \
    458         src-server/CloudUserProfileListImpl.cpp \
     458        src-server/CloudUserProfilesImpl.cpp \
    459459        src-server/CloudUserProfileManagerImpl.cpp \
    460460        src-server/DHCPServerImpl.cpp \

  • trunk/src/VBox/Main/idl/VirtualBox.xidl

    r73216 r73337  
    2504525045
    2504625046  <!--
    25047   // ICloudUserProfileList
     25047  // ICloudUserProfiles
    2504825048  //////////////////////////////////////////////////////////////////////////
    2504925049  -->
    2505025050
    2505125051  <interface
    25052     name="ICloudUserProfileList" extends="$unknown"
     25052    name="ICloudUserProfiles" extends="$unknown"
    2505325053    uuid="cfadfecb-ef89-41a9-abbd-9772d41baddb"
    2505425054    wsmap="managed" reservedMethods="4" reservedAttributes="4"
    … …  
    2518125181    <method name="getAllProfiles" const="yes">
    2518225182      <desc>
    25183         Returns the list of the ICloudUserProfileList in one call.
    25184       </desc>
    25185       <param name="profileList" type="ICloudUserProfileList" safearray="yes" dir="return">
    25186         <desc>Returns the list of ICloudUserProfileList.</desc>
     25183        Returns the list of the ICloudUserProfiles in one call.
     25184      </desc>
     25185      <param name="profileList" type="ICloudUserProfiles" safearray="yes" dir="return">
     25186        <desc>Returns the list of ICloudUserProfiles.</desc>
    2518725187      </param>
    2518825188    </method>
    … …  
    2519025190    <method name="getProfilesByProvider" const="yes">
    2519125191      <desc>
    25192         Returns the ICloudUserProfileList for the particular provider.
     25192        Returns the ICloudUserProfiles for the particular provider.
    2519325193      </desc>
    2519425194      <param name="providerId" type="CloudProviderId" dir="in">
    2519525195      </param>
    25196       <param name="profile" type="ICloudUserProfileList" dir="return">
    25197         <desc>Returns the ICloudUserProfileList.</desc>
     25196      <param name="profile" type="ICloudUserProfiles" dir="return">
     25197        <desc>Returns the ICloudUserProfiles.</desc>
    2519825198      </param>
    2519925199    </method>

  • trunk/src/VBox/Main/include/CloudClientImpl.h

    r73216 r73337  
    2525
    2626/* VBox forward declarations */
    27 class CloudUserProfileList;
     27class CloudUserProfiles;
    2828
    2929class CloudClient :
    … …  
    3838
    3939    HRESULT init(VirtualBox *aVirtualBox);
    40     HRESULT initCloudClient(CloudUserProfileList *aProfiles,
     40    HRESULT initCloudClient(CloudUserProfiles *aProfiles,
    4141                            VirtualBox *aParent,
    4242                            CloudProviderId_T aCloudProvider,
    … …  
    7777    DECLARE_EMPTY_CTOR_DTOR(CloudClientOCI)
    7878
    79     HRESULT initCloudClient(CloudUserProfileList *aProfiles,
     79    HRESULT initCloudClient(CloudUserProfiles *aProfiles,
    8080                            VirtualBox *aParent,
    8181                            CloudProviderId_T aCloudProvider,

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

    r73164 r73337  
    2222/* VBox includes */
    2323#include "CloudUserProfileManagerWrap.h"
    24 #include "CloudUserProfileListImpl.h"
     24#include "CloudUserProfilesImpl.h"
    2525
    2626/* VBox forward declarations */
    … …  
    4444
    4545    HRESULT getSupportedProviders(std::vector<CloudProviderId_T> &aProviderTypes);
    46     HRESULT getAllProfiles(std::vector< ComPtr<ICloudUserProfileList> > &aProfilesList);
    47     HRESULT getProfilesByProvider(CloudProviderId_T aProviderType, ComPtr<ICloudUserProfileList> &aProfiles);
     46    HRESULT getAllProfiles(std::vector< ComPtr<ICloudUserProfiles> > &aProfilesList);
     47    HRESULT getProfilesByProvider(CloudProviderId_T aProviderType, ComPtr<ICloudUserProfiles> &aProfiles);
    4848};
    4949

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

    r73336 r73337  
    1717
    1818
    19 #ifndef ____H_CLOUDUSERPROFILELISTIMPL
    20 #define ____H_CLOUDUSERPROFILELISTIMPL
     19#ifndef ____H_CLOUDUSERPROFILESIMPL
     20#define ____H_CLOUDUSERPROFILESIMPL
    2121
    2222//#include <map>
    … …  
    2525/* VBox includes */
    2626#include "CloudClientImpl.h"
    27 #include "CloudUserProfileListWrap.h"
     27#include "CloudUserProfilesWrap.h"
    2828#include "UnattendedScript.h"
    2929
    … …  
    3131class SimpleConfigFile;
    3232
    33 class CloudUserProfileList : public CloudUserProfileListWrap
     33class CloudUserProfiles : public CloudUserProfilesWrap
    3434{
    3535public:
    36     CloudUserProfileList();
    37     virtual ~CloudUserProfileList();
     36    CloudUserProfiles();
     37    virtual ~CloudUserProfiles();
    3838    HRESULT FinalConstruct();
    3939    void FinalRelease();
    … …  
    6767
    6868
    69 class OCIUserProfileList :
    70     public CloudUserProfileList
     69class OCIUserProfiles :
     70    public CloudUserProfiles
    7171{
    7272public:
    73     OCIUserProfileList();
    74     ~OCIUserProfileList();
     73    OCIUserProfiles();
     74    ~OCIUserProfiles();
    7575
    7676    HRESULT getProvider(CloudProviderId_T *aProvider)
    … …  
    136136    //////////////////New functions//////////////////////////////
    137137};
    138 #endif // !____H_CLOUDUSERPROFILELISTIMPL
     138#endif // !____H_CLOUDUSERPROFILESIMPL
    139139/* vi: set tabstop=4 shiftwidth=4 expandtab: */
    140140

  • trunk/src/VBox/Main/src-server/CloudClientImpl.cpp

    r73321 r73337  
    2424#include "CloudClientImpl.h"
    2525#include "CloudUserProfileManagerImpl.h"
    26 #include "CloudUserProfileListImpl.h"
     26#include "CloudUserProfilesImpl.h"
    2727#include "VirtualBoxImpl.h"
    2828#include "Global.h"
    … …  
    9797}
    9898
    99 HRESULT CloudClient::initCloudClient(CloudUserProfileList *aProfiles,
     99HRESULT CloudClient::initCloudClient(CloudUserProfiles *aProfiles,
    100100                                     VirtualBox *aParent,
    101101                                     CloudProviderId_T aCloudProvider,
    … …  
    117117        mCloudProvider = aCloudProvider;
    118118        LogRel(("CloudProvider = %d\n", mCloudProvider));
    119         CloudUserProfileList *lProfiles = aProfiles;
     119        CloudUserProfiles*lProfiles = aProfiles;
    120120        std::vector<com::Utf8Str> lNames;
    121121        std::vector<com::Utf8Str> lValues;
    … …  
    252252}
    253253
    254 HRESULT CloudClientOCI::initCloudClient(CloudUserProfileList *aProfiles,
     254HRESULT CloudClientOCI::initCloudClient(CloudUserProfiles *aProfiles,
    255255                                     VirtualBox *aParent,
    256256                                     CloudProviderId_T aCloudProvider,
    … …  
    272272        mCloudProvider = aCloudProvider;
    273273        LogRel(("CloudClientOCI = %d\n", mCloudProvider));
    274         CloudUserProfileList *lProfiles = aProfiles;
     274        CloudUserProfiles *lProfiles = aProfiles;
    275275        std::vector<com::Utf8Str> lNames;
    276276        std::vector<com::Utf8Str> lValues;
    … …  
    386386"\t""\t""\"type\": 29,\n"
    387387"\t""\t""\"min\": 10,\n"
    388 "\t""\t""\"max\": 50,\n"
     388"\t""\t""\"max\": 300,\n"
    389389"\t""\t""\"unit\": \"GB\"\n"
    390390"\t""},\n"

  • trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp

    r73221 r73337  
    2323
    2424#include "CloudUserProfileManagerImpl.h"
    25 #include "CloudUserProfileListImpl.h"
     25#include "CloudUserProfilesImpl.h"
    2626#include "VirtualBoxImpl.h"
    2727#include "Global.h"
    … …  
    9090}
    9191
    92 HRESULT CloudUserProfileManager::getAllProfiles(std::vector<ComPtr<ICloudUserProfileList> > &aProfilesList)
     92HRESULT CloudUserProfileManager::getAllProfiles(std::vector<ComPtr<ICloudUserProfiles> > &aProfilesList)
    9393{
    9494    HRESULT hrc = S_OK;
    95     std::vector<ComPtr<ICloudUserProfileList> > lProfilesList;
     95    std::vector<ComPtr<ICloudUserProfiles> > lProfilesList;
    9696    for (size_t i=0;i<mSupportedProviders.size();++i)
    9797    {
    98         ComPtr<ICloudUserProfileList> lProfiles;
     98        ComPtr<ICloudUserProfiles> lProfiles;
    9999        hrc = getProfilesByProvider(mSupportedProviders.at(i), lProfiles);
    100100        if (FAILED(hrc))
    … …  
    111111
    112112HRESULT CloudUserProfileManager::getProfilesByProvider(CloudProviderId_T aProviderType,
    113                                                        ComPtr<ICloudUserProfileList> &aProfiles)
     113                                                       ComPtr<ICloudUserProfiles> &aProfiles)
    114114{
    115     ComObjPtr<CloudUserProfileList> ptrCloudUserProfileList;
    116     HRESULT hrc = ptrCloudUserProfileList.createObject();
     115    ComObjPtr<CloudUserProfiles> ptrCloudUserProfiles;
     116    HRESULT hrc = ptrCloudUserProfiles.createObject();
    117117    switch(aProviderType)
    118118    {
    119119        case CloudProviderId_OCI:
    120120        default:
    121             ComObjPtr<OCIUserProfileList> ptrOCIUserProfileList;
    122             hrc = ptrOCIUserProfileList.createObject();
     121            ComObjPtr<OCIUserProfiles> ptrOCIUserProfiles;
     122            hrc = ptrOCIUserProfiles.createObject();
    123123            if (SUCCEEDED(hrc))
    124124            {
    125125                AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS);
    126126
    127                 hrc = ptrOCIUserProfileList->init(mParent);
     127                hrc = ptrOCIUserProfiles->init(mParent);
    128128                if (SUCCEEDED(hrc))
    129129                {
    … …  
    137137                        if (RTFileExists(szOciConfigPath))
    138138                        {
    139                             hrc = ptrOCIUserProfileList->readProfiles(szOciConfigPath);
     139                            hrc = ptrOCIUserProfiles->readProfiles(szOciConfigPath);
    140140                            if (SUCCEEDED(hrc))
    141141                                LogRel(("Reading profiles from %s has been done\n", szOciConfigPath));
    … …  
    143143                                LogRel(("Reading profiles from %s hasn't been done\n", szOciConfigPath));
    144144
    145                             ptrCloudUserProfileList = ptrOCIUserProfileList;
    146                             hrc = ptrCloudUserProfileList.queryInterfaceTo(aProfiles.asOutParam());
     145                            ptrCloudUserProfiles = ptrOCIUserProfiles;
     146                            hrc = ptrCloudUserProfiles.queryInterfaceTo(aProfiles.asOutParam());
    147147                        }
    148148                        else

  • trunk/src/VBox/Main/src-server/CloudUserProfilesImpl.cpp

    r73336 r73337  
    11/* $Id$ */
    22/** @file
    3  * ICloudUserProfileList COM class implementations.
     3 * ICloudUserProfiles COM class implementations.
    44 */
    55
    … …  
    2121#include <VBox/com/array.h>
    2222
    23 #include "CloudUserProfileListImpl.h"
     23#include "CloudUserProfilesImpl.h"
    2424#include "VirtualBoxImpl.h"
    2525#include "Global.h"
    … …  
    210210////////////////////////////////////////////////////////////////////////////////
    211211//
    212 // ICloudUserProfileList implementation
     212// ICloudUserProfiles implementation
    213213//
    214214////////////////////////////////////////////////////////////////////////////////
    215 CloudUserProfileList::CloudUserProfileList()
     215CloudUserProfiles::CloudUserProfiles()
    216216    : mParent(NULL)
    217217{
    218218}
    219219
    220 CloudUserProfileList::~CloudUserProfileList()
    221 {
    222     LogRel(("CloudUserProfileListImpl::~CloudUserProfileListImpl()\n"));
     220CloudUserProfiles::~CloudUserProfiles()
     221{
     222    LogRel(("CloudUserProfilesImpl::~CloudUserProfilesImpl()\n"));
    223223    unconst(mParent) = NULL;
    224224}
    225225
    226 HRESULT CloudUserProfileList::FinalConstruct()
     226HRESULT CloudUserProfiles::FinalConstruct()
    227227{
    228228    return BaseFinalConstruct();
    229229}
    230230
    231 void CloudUserProfileList::FinalRelease()
     231void CloudUserProfiles::FinalRelease()
    232232{
    233233    uninit();
    … …  
    236236}
    237237
    238 void CloudUserProfileList::uninit()
     238void CloudUserProfiles::uninit()
    239239{
    240240    /* Enclose the state transition Ready->InUninit->NotReady */
    … …  
    246246}
    247247
    248 HRESULT CloudUserProfileList::init(VirtualBox *aParent)
     248HRESULT CloudUserProfiles::init(VirtualBox *aParent)
    249249{
    250250    /* Enclose the state transition NotReady->InInit->Ready */
    … …  
    259259
    260260
    261 HRESULT CloudUserProfileList::getSupportedPropertiesNames(std::vector<com::Utf8Str> &aPropertiesNames)
    262 {
    263     LogRel(("CloudUserProfileList::getSupportedPropertiesNames:\n"));
     261HRESULT CloudUserProfiles::getSupportedPropertiesNames(std::vector<com::Utf8Str> &aPropertiesNames)
     262{
     263    LogRel(("CloudUserProfiles::getSupportedPropertiesNames:\n"));
    264264    aPropertiesNames.clear();
    265265    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
    266266}
    267267
    268 HRESULT CloudUserProfileList::readProfiles(const Utf8Str &strConfigPath)
    269 {
    270     LogRel(("CloudUserProfileList::readProfiles: %s\n", strConfigPath.c_str()));
    271     return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
    272 }
    273 
    274 HRESULT CloudUserProfileList::getProvider(CloudProviderId_T *aProvider)
     268HRESULT CloudUserProfiles::readProfiles(const Utf8Str &strConfigPath)
     269{
     270    LogRel(("CloudUserProfiles::readProfiles: %s\n", strConfigPath.c_str()));
     271    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
     272}
     273
     274HRESULT CloudUserProfiles::getProvider(CloudProviderId_T *aProvider)
    275275{
    276276    *aProvider = CloudProviderId_Unknown;
    277     LogRel(("CloudUserProfileList::getProvider: %d\n", *aProvider));
    278     return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
    279 }
    280 
    281 HRESULT CloudUserProfileList::createProfile(const com::Utf8Str &aProfileName,
     277    LogRel(("CloudUserProfiles::getProvider: %d\n", *aProvider));
     278    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
     279}
     280
     281HRESULT CloudUserProfiles::createProfile(const com::Utf8Str &aProfileName,
    282282                                            const std::vector<com::Utf8Str> &aNames,
    283283                                            const std::vector<com::Utf8Str> &aValues)
    284284{
    285     LogRel(("CloudUserProfileList::createProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
    286     return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
    287 }
    288 
    289 HRESULT CloudUserProfileList::updateProfile(const com::Utf8Str &aProfileName,
     285    LogRel(("CloudUserProfiles::createProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
     286    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
     287}
     288
     289HRESULT CloudUserProfiles::updateProfile(const com::Utf8Str &aProfileName,
    290290                                            const std::vector<com::Utf8Str> &aNames,
    291291                                            const std::vector<com::Utf8Str> &aValues)
    292292{
    293     LogRel(("CloudUserProfileList::updateProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
    294     return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
    295 }
    296 
    297 HRESULT CloudUserProfileList::getStoredProfilesNames(std::vector<com::Utf8Str> &aProfilesNames)
    298 {
    299 
    300     LogRel(("CloudUserProfileList::getStoredProfilesNames:\n"));
     293    LogRel(("CloudUserProfiles::updateProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
     294    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
     295}
     296
     297HRESULT CloudUserProfiles::getStoredProfilesNames(std::vector<com::Utf8Str> &aProfilesNames)
     298{
     299
     300    LogRel(("CloudUserProfiles::getStoredProfilesNames:\n"));
    301301    aProfilesNames.clear();
    302302    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
    303303}
    304304
    305 HRESULT CloudUserProfileList::getProfileProperties(const com::Utf8Str &aProfileName,
     305HRESULT CloudUserProfiles::getProfileProperties(const com::Utf8Str &aProfileName,
    306306                                              std::vector<com::Utf8Str> &aReturnNames,
    307307                                              std::vector<com::Utf8Str> &aReturnValues)
    308308{
    309     LogRel(("CloudUserProfileList::getProfileProperties: %s\n", aProfileName.c_str()));
     309    LogRel(("CloudUserProfiles::getProfileProperties: %s\n", aProfileName.c_str()));
    310310    aReturnNames.clear();
    311311    aReturnValues.clear();
    … …  
    313313}
    314314
    315 HRESULT CloudUserProfileList::getPropertyDescription(const com::Utf8Str &aName,
     315HRESULT CloudUserProfiles::getPropertyDescription(const com::Utf8Str &aName,
    316316                                                     com::Utf8Str &aDescription)
    317317{
    318     LogRel(("CloudUserProfileList::getPropertyDescription: %s, %s\n", aName.c_str(), aDescription.c_str()));
    319     return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
    320 }
    321 
    322 HRESULT CloudUserProfileList::createCloudClient(const com::Utf8Str &aProfileName,
     318    LogRel(("CloudUserProfiles::getPropertyDescription: %s, %s\n", aName.c_str(), aDescription.c_str()));
     319    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
     320}
     321
     322HRESULT CloudUserProfiles::createCloudClient(const com::Utf8Str &aProfileName,
    323323                                                ComPtr<ICloudClient> &aCloudClient)
    324324{
    325     LogRel(("CloudUserProfileList::createCloudClient: %s\n", aProfileName.c_str()));
     325    LogRel(("CloudUserProfiles::createCloudClient: %s\n", aProfileName.c_str()));
    326326
    327327    if (aCloudClient.isNull())
    … …  
    355355
    356356
    357 OCIUserProfileList::OCIUserProfileList()
    358 {
    359     LogRel(("OCIUserProfileList::OCIUserProfileList()\n"));
     357OCIUserProfiles::OCIUserProfiles()
     358{
     359    LogRel(("OCIUserProfiles::OCIUserProfiles()\n"));
    360360    mpProfiles = new SimpleConfigFile(mParent);
    361361    LogRel(("Succeeded create SimpleConfigFile\n"));
    362362}
    363363
    364 OCIUserProfileList::~OCIUserProfileList()
    365 {
    366     LogRel(("OCIUserProfileList::~OCIUserProfileList()\n"));
     364OCIUserProfiles::~OCIUserProfiles()
     365{
     366    LogRel(("OCIUserProfiles::~OCIUserProfiles()\n"));
    367367    if (mpProfiles)
    368368        delete mpProfiles;
    369369}
    370370
    371 HRESULT OCIUserProfileList::createCloudClient(const com::Utf8Str &aProfileName,
     371HRESULT OCIUserProfiles::createCloudClient(const com::Utf8Str &aProfileName,
    372372                                              ComPtr<ICloudClient> &aCloudClient)
    373373{
    … …  
    394394}
    395395
    396 HRESULT OCIUserProfileList::readProfiles(const Utf8Str &strConfigPath)
     396HRESULT OCIUserProfiles::readProfiles(const Utf8Str &strConfigPath)
    397397{
    398398    LogRel(("Reading profiles from %s\n", strConfigPath.c_str()));
    … …  
    422422}
    423423
    424 HRESULT OCIUserProfileList::createProfile(const com::Utf8Str &aProfileName,
     424HRESULT OCIUserProfiles::createProfile(const com::Utf8Str &aProfileName,
    425425                                          const std::vector<com::Utf8Str> &aNames,
    426426                                          const std::vector<com::Utf8Str> &aValues)
    … …  
    446446}
    447447
    448 HRESULT OCIUserProfileList::updateProfile(const com::Utf8Str &aProfileName,
     448HRESULT OCIUserProfiles::updateProfile(const com::Utf8Str &aProfileName,
    449449                                          const std::vector<com::Utf8Str> &aNames,
    450450                                          const std::vector<com::Utf8Str> &aValues)
    … …  
    469469}
    470470
    471 HRESULT OCIUserProfileList::getStoredProfilesNames(std::vector<com::Utf8Str> &aProfilesNames)
     471HRESULT OCIUserProfiles::getStoredProfilesNames(std::vector<com::Utf8Str> &aProfilesNames)
    472472{
    473473    HRESULT hrc = S_OK;
    … …  
    479479}
    480480
    481 HRESULT OCIUserProfileList::getProfileProperties(const com::Utf8Str &aProfileName,
     481HRESULT OCIUserProfiles::getProfileProperties(const com::Utf8Str &aProfileName,
    482482                                                 std::vector<com::Utf8Str> &aReturnNames,
    483483                                                 std::vector<com::Utf8Str> &aReturnValues)
    … …  
    508508}
    509509
    510 HRESULT OCIUserProfileList::getSupportedPropertiesNames(std::vector<com::Utf8Str> &aPropertiesNames)
     510HRESULT OCIUserProfiles::getSupportedPropertiesNames(std::vector<com::Utf8Str> &aPropertiesNames)
    511511{
    512512    HRESULT hrc = S_OK;
    … …  
    516516}
    517517
    518 HRESULT OCIUserProfileList::getPropertyDescription(const com::Utf8Str &aName, com::Utf8Str &aDescription)
     518HRESULT OCIUserProfiles::getPropertyDescription(const com::Utf8Str &aName, com::Utf8Str &aDescription)
    519519{
    520520    HRESULT hrc = S_OK;
    … …  
    528528
    529529
    530 HRESULT OCIUserProfileList::i_createProfile(const com::Utf8Str &aProfileName,
     530HRESULT OCIUserProfiles::i_createProfile(const com::Utf8Str &aProfileName,
    531531                                           const std::map <Utf8Str, Utf8Str> &aProfile)
    532532{
    … …  
    538538}
    539539
    540 HRESULT OCIUserProfileList::i_updateProfile(const com::Utf8Str &aProfileName,
     540HRESULT OCIUserProfiles::i_updateProfile(const com::Utf8Str &aProfileName,
    541541                                           const std::map <Utf8Str, Utf8Str> &aProfile)
    542542{
    … …  
    551551}
    552552
    553 HRESULT OCIUserProfileList::i_getProfileProperties(const com::Utf8Str &aProfileName,
     553HRESULT OCIUserProfiles::i_getProfileProperties(const com::Utf8Str &aProfileName,
    554554                                                  std::map <Utf8Str, Utf8Str> &aProfile)
    555555{
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette