VirtualBox

Ignore:
Timestamp:
Jul 23, 2018 1:20:36 PM (7 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
123927
Message:

FE/Qt: bugref:9152: Export Appliance wizard: Virtual System Description page: Rename group of abstract parameter classes accordingly, they can be reused in future.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h

    r73318 r73319  
    4141
    4242
    43 /** Cloud Client Parameter internal kinds. */
    44 enum CloudClientParameterKind
     43/** Abstract VSD parameter kinds. */
     44enum AbstractVSDParameterKind
    4545{
    4646    ParameterKind_Invalid,
    … …  
    5151};
    5252
    53 /** CloudClient parameter of Bool type, internal level. */
    54 struct CloudClientParameterBool
     53/** Abstract VSD parameter of Bool type, internal level. */
     54struct AbstractVSDParameterBool
    5555{
    5656    /** Public default constructor to fit Q_DECLARE_METATYPE rule. */
    57     CloudClientParameterBool()
     57    AbstractVSDParameterBool()
    5858        : value(false) {}
    5959    /** Public copy constructor to fit Q_DECLARE_METATYPE rule. */
    60     CloudClientParameterBool(const CloudClientParameterBool &other)
     60    AbstractVSDParameterBool(const AbstractVSDParameterBool &other)
    6161        : value(other.value) {}
    6262    /** Holds the value. */
    6363    bool value;
    6464};
    65 Q_DECLARE_METATYPE(CloudClientParameterBool);
    66 
    67 /** CloudClient parameter of Double type, internal level. */
    68 struct CloudClientParameterDouble
     65Q_DECLARE_METATYPE(AbstractVSDParameterBool);
     66
     67/** Abstract VSD parameter of Double type, internal level. */
     68struct AbstractVSDParameterDouble
    6969{
    7070    /** Public default constructor to fit Q_DECLARE_METATYPE rule. */
    71     CloudClientParameterDouble()
     71    AbstractVSDParameterDouble()
    7272        : minimum(0), maximum(0), unit(QString()) {}
    7373    /** Public copy constructor to fit Q_DECLARE_METATYPE rule. */
    74     CloudClientParameterDouble(const CloudClientParameterDouble &other)
     74    AbstractVSDParameterDouble(const AbstractVSDParameterDouble &other)
    7575        : minimum(other.minimum), maximum(other.maximum), unit(other.unit) {}
    7676    /** Holds the minimum/base value. */
    … …  
    8181    QString  unit;
    8282};
    83 Q_DECLARE_METATYPE(CloudClientParameterDouble);
    84 
    85 /** CloudClient parameter of String type, internal level. */
    86 struct CloudClientParameterString
     83Q_DECLARE_METATYPE(AbstractVSDParameterDouble);
     84
     85/** Abstract VSD parameter of String type, internal level. */
     86struct AbstractVSDParameterString
    8787{
    8888    /** Public default constructor to fit Q_DECLARE_METATYPE rule. */
    89     CloudClientParameterString()
     89    AbstractVSDParameterString()
    9090        : value(QString()) {}
    9191    /** Public copy constructor to fit Q_DECLARE_METATYPE rule. */
    92     CloudClientParameterString(const CloudClientParameterString &other)
     92    AbstractVSDParameterString(const AbstractVSDParameterString &other)
    9393        : value(other.value) {}
    9494    /** Holds the value. */
    9595    QString value;
    9696};
    97 Q_DECLARE_METATYPE(CloudClientParameterString);
    98 
    99 /** CloudClient parameter of Array type, internal level. */
    100 struct CloudClientParameterArray
     97Q_DECLARE_METATYPE(AbstractVSDParameterString);
     98
     99/** Abstract VSD parameter of Array type, internal level. */
     100struct AbstractVSDParameterArray
    101101{
    102102    /** Public default constructor to fit Q_DECLARE_METATYPE rule. */
    103     CloudClientParameterArray()
     103    AbstractVSDParameterArray()
    104104        : values(QStringList()) {}
    105105    /** Public copy constructor to fit Q_DECLARE_METATYPE rule. */
    106     CloudClientParameterArray(const CloudClientParameterArray &other)
     106    AbstractVSDParameterArray(const AbstractVSDParameterArray &other)
    107107        : values(other.values) {}
    108108    /** Holds the values array. */
    109109    QStringList values;
    110110};
    111 Q_DECLARE_METATYPE(CloudClientParameterArray);
    112 
    113 /** CloudClient parameter interface, facade level. */
    114 struct CloudClientParameter
     111Q_DECLARE_METATYPE(AbstractVSDParameterArray);
     112
     113/** Abstract VSD parameter interface, facade level. */
     114struct AbstractVSDParameter
    115115{
    116116    /** Holds the parameter name. */
    … …  
    119119    KVirtualSystemDescriptionType  type;
    120120    /** Holds the parameter kind. */
    121     CloudClientParameterKind       kind;
     121    AbstractVSDParameterKind       kind;
    122122    /** Holds the parameter abstract getter. */
    123123    QVariant                       get;

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

    r73318 r73319  
    7979
    8080/* static */
    81 QList<CloudClientParameter> UIWizardExportAppPage4::parseJsonDocument(const QJsonDocument &document)
     81QList<AbstractVSDParameter> UIWizardExportAppPage4::parseJsonDocument(const QJsonDocument &document)
    8282{
    8383    /* Prepare parameters: */
    84     QList<CloudClientParameter> parameters;
     84    QList<AbstractVSDParameter> parameters;
    8585
    8686    /* Convert document to object, make sure it isn't empty: */
    … …  
    9494
    9595        /* Prepare parameter: */
    96         CloudClientParameter parameter;
     96        AbstractVSDParameter parameter;
    9797
    9898        /* Assign name: */
    … …  
    125125            if (strFieldName == "bool")
    126126            {
    127                 CloudClientParameterBool get;
     127                AbstractVSDParameterBool get;
    128128                get.value = parseJsonFieldBool(strFieldName, field);
    129129                parameter.get = QVariant::fromValue(get);
    … …  
    133133            if (strFieldName == "min")
    134134            {
    135                 CloudClientParameterDouble get = parameter.get.value<CloudClientParameterDouble>();
     135                AbstractVSDParameterDouble get = parameter.get.value<AbstractVSDParameterDouble>();
    136136                get.minimum = parseJsonFieldDouble(strFieldName, field);
    137137                parameter.get = QVariant::fromValue(get);
    … …  
    141141            if (strFieldName == "max")
    142142            {
    143                 CloudClientParameterDouble get = parameter.get.value<CloudClientParameterDouble>();
     143                AbstractVSDParameterDouble get = parameter.get.value<AbstractVSDParameterDouble>();
    144144                get.maximum = parseJsonFieldDouble(strFieldName, field);
    145145                parameter.get = QVariant::fromValue(get);
    … …  
    149149            if (strFieldName == "unit")
    150150            {
    151                 CloudClientParameterDouble get = parameter.get.value<CloudClientParameterDouble>();
     151                AbstractVSDParameterDouble get = parameter.get.value<AbstractVSDParameterDouble>();
    152152                get.unit = parseJsonFieldString(strFieldName, field);
    153153                parameter.get = QVariant::fromValue(get);
    … …  
    157157            if (strFieldName == "items")
    158158            {
    159                 CloudClientParameterArray get;
     159                AbstractVSDParameterArray get;
    160160                get.values = parseJsonFieldArray(strFieldName, field);
    161161                parameter.get = QVariant::fromValue(get);

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

    r73318 r73319  
    4646
    4747    /** Parses JSON @a document. */
    48     static QList<CloudClientParameter> parseJsonDocument(const QJsonDocument &document);
     48    static QList<AbstractVSDParameter> parseJsonDocument(const QJsonDocument &document);
    4949    /** Parses JSON bool @a field. */
    5050    static bool parseJsonFieldBool(const QString &strFieldName, const QJsonValue &field);
    … …  
    6363
    6464    /** Holds the cloud client parameters. */
    65     QList<CloudClientParameter> m_listCloudClientParameters;
     65    QList<AbstractVSDParameter> m_listCloudClientParameters;
    6666
    6767    /** Holds the appliance widget reference. */
Note: See TracChangeset for help on using the changeset viewer.

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