diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-11-18 00:34:29 -0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 04:30:24 +0100 |
| commit | 7030dc08e8a9198390ccf038d3c8629b047e4749 (patch) | |
| tree | f8ea8f519e6a0e369ecae068003e61f7ac127f24 | |
| parent | a1ced4d08cd55dccaf4d720880632ba8551bb109 (diff) | |
Update MOF and DuSE metamodels
UML updating coming soon
Change-Id: Icc4cc0ea005bce01db8fb0f0ea0636ed166a980a
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
39 files changed, 122 insertions, 78 deletions
diff --git a/scripts/templates/common.tmpl b/scripts/templates/common.tmpl index 17b302e3..fe2ca3b2 100644 --- a/scripts/templates/common.tmpl +++ b/scripts/templates/common.tmpl @@ -473,7 +473,7 @@ void Q${namespace}${originalClassName}Object::unset${qtAttribute.remove("^is").u [%- ELSIF defaultType == "uml:LiteralUnlimitedNatural" -%] [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%] [%- IF defaultValue != "" -%] - set${qtAttribute.remove("^is").ucfirst}(${defaultValue}); + set${qtAttribute.remove("^is").ucfirst}(QStringLiteral("${defaultValue}")); [%- ELSE -%] set${qtAttribute.remove("^is").ucfirst}(QStringLiteral("")); [%- END -%] diff --git a/src/duse/duse.pro b/src/duse/duse.pro index d6e1e476..ae32822f 100644 --- a/src/duse/duse.pro +++ b/src/duse/duse.pro @@ -1,7 +1,7 @@ load(qt_build_config) TARGET = QtDuse -QT = core-private modeling-private +QT = core-private modeling-private uml QMAKE_DOCS = $$PWD/doc/qtduse.qdocconf @@ -9,4 +9,4 @@ load(qt_module) include(duse.pri) -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
\ No newline at end of file +HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/duse/qdusevariationpoint.cpp b/src/duse/qdusevariationpoint.cpp index ecff14ec..ea077e74 100644 --- a/src/duse/qdusevariationpoint.cpp +++ b/src/duse/qdusevariationpoint.cpp @@ -42,6 +42,8 @@ #include "private/qdusevariationpointobject_p.h" +#include <QtUml/QUmlProperty> + QT_BEGIN_NAMESPACE /*! @@ -51,7 +53,8 @@ QT_BEGIN_NAMESPACE \brief A variation point represents a specific solution for a given design dimension. A variation point entails validation rules which check for valid combinations of variation points and a script which defines the architectural changes to be enacted from such solution. */ -QDuseVariationPoint::QDuseVariationPoint(bool createQModelingObject) +QDuseVariationPoint::QDuseVariationPoint(bool createQModelingObject) : + _modelChange(0) { if (createQModelingObject) _qModelingObject = qobject_cast<QModelingObject *>(new QDuseVariationPointObject(this)); @@ -63,7 +66,8 @@ QModelingElement *QDuseVariationPoint::clone() const c->setName(name()); c->setRationale(rationale()); c->setPreChangeValidationRule(preChangeValidationRule()); - c->setModelChange(modelChange()); + if (modelChange()) + c->setModelChange(dynamic_cast<QUmlProperty *>(modelChange()->clone())); return c; } @@ -129,19 +133,21 @@ void QDuseVariationPoint::setPreChangeValidationRule(QString preChangeValidation /*! The architectural changes to be enacted as contributions arosen from this variation point. The complete set of architectural changes is the merge of architectural contributions from all involved variation points. */ -QString QDuseVariationPoint::modelChange() const +QUmlProperty *QDuseVariationPoint::modelChange() const { // This is a read-write property return _modelChange; } -void QDuseVariationPoint::setModelChange(QString modelChange) +void QDuseVariationPoint::setModelChange(QUmlProperty *modelChange) { // This is a read-write property if (_modelChange != modelChange) { _modelChange = modelChange; + if (modelChange && modelChange->asQModelingObject() && this->asQModelingObject()) + QObject::connect(modelChange->asQModelingObject(), SIGNAL(destroyed()), this->asQModelingObject(), SLOT(setModelChange())); } } diff --git a/src/duse/qdusevariationpoint.h b/src/duse/qdusevariationpoint.h index 17bda445..fb94f348 100644 --- a/src/duse/qdusevariationpoint.h +++ b/src/duse/qdusevariationpoint.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtDuse) +class QUmlProperty; + class Q_DUSE_EXPORT QDuseVariationPoint : public QModelingElement { public: @@ -65,14 +67,14 @@ public: void setRationale(QString rationale); QString preChangeValidationRule() const; void setPreChangeValidationRule(QString preChangeValidationRule); - QString modelChange() const; - void setModelChange(QString modelChange); + QUmlProperty *modelChange() const; + void setModelChange(QUmlProperty *modelChange); protected: QString _name; QString _rationale; QString _preChangeValidationRule; - QString _modelChange; + QUmlProperty *_modelChange; }; QT_END_NAMESPACE diff --git a/src/duse/qobjects/qdusevariationpointobject.cpp b/src/duse/qobjects/qdusevariationpointobject.cpp index 185bcc6d..63ba6a5d 100644 --- a/src/duse/qobjects/qdusevariationpointobject.cpp +++ b/src/duse/qobjects/qdusevariationpointobject.cpp @@ -42,6 +42,8 @@ #include "private/qmodelingobject_p.h" #include <QtDuse/QDuseVariationPoint> +#include <QtUml/QUmlProperty> + QT_BEGIN_NAMESPACE QDuseVariationPointObject::QDuseVariationPointObject(QDuseVariationPoint *modelingElement) @@ -68,9 +70,12 @@ QString QDuseVariationPointObject::preChangeValidationRule() const return qmodelingelementproperty_cast<QDuseVariationPoint *>(this)->preChangeValidationRule(); } -QString QDuseVariationPointObject::modelChange() const +QObject *QDuseVariationPointObject::modelChange() const { - return qmodelingelementproperty_cast<QDuseVariationPoint *>(this)->modelChange(); + if (!qmodelingelementproperty_cast<QDuseVariationPoint *>(this)->modelChange()) + return 0; + else + return qmodelingelementproperty_cast<QDuseVariationPoint *>(this)->modelChange()->asQModelingObject(); } // SLOTS FOR OWNED ATTRIBUTES [VariationPoint] @@ -93,9 +98,9 @@ void QDuseVariationPointObject::setPreChangeValidationRule(QString preChangeVali emit preChangeValidationRuleChanged(this->preChangeValidationRule()); } -void QDuseVariationPointObject::setModelChange(QString modelChange) +void QDuseVariationPointObject::setModelChange(QObject *modelChange) { - qmodelingelementproperty_cast<QDuseVariationPoint *>(this)->setModelChange(modelChange); + qmodelingelementproperty_cast<QDuseVariationPoint *>(this)->setModelChange(qmodelingelementproperty_cast<QUmlProperty *>(modelChange)); emit modelChangeChanged(this->modelChange()); } diff --git a/src/duse/qobjects/qdusevariationpointobject_p.h b/src/duse/qobjects/qdusevariationpointobject_p.h index 9d890d23..44fc3454 100644 --- a/src/duse/qobjects/qdusevariationpointobject_p.h +++ b/src/duse/qobjects/qdusevariationpointobject_p.h @@ -63,7 +63,7 @@ class Q_DUSE_EXPORT QDuseVariationPointObject : public QModelingObject Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QString rationale READ rationale WRITE setRationale NOTIFY rationaleChanged) Q_PROPERTY(QString preChangeValidationRule READ preChangeValidationRule WRITE setPreChangeValidationRule NOTIFY preChangeValidationRuleChanged) - Q_PROPERTY(QString modelChange READ modelChange WRITE setModelChange NOTIFY modelChangeChanged) + Q_PROPERTY(QObject * modelChange READ modelChange WRITE setModelChange NOTIFY modelChangeChanged) public: Q_INVOKABLE explicit QDuseVariationPointObject(QDuseVariationPoint *modelingElement); @@ -72,7 +72,7 @@ public: Q_INVOKABLE QString name() const; Q_INVOKABLE QString rationale() const; Q_INVOKABLE QString preChangeValidationRule() const; - Q_INVOKABLE QString modelChange() const; + Q_INVOKABLE QObject *modelChange() const; public Q_SLOTS: @@ -80,7 +80,7 @@ public Q_SLOTS: void setName(QString name); void setRationale(QString rationale); void setPreChangeValidationRule(QString preChangeValidationRule); - void setModelChange(QString modelChange); + void setModelChange(QObject *modelChange = 0); Q_SIGNALS: @@ -88,7 +88,7 @@ Q_SIGNALS: void nameChanged(QString name); void rationaleChanged(QString rationale); void preChangeValidationRuleChanged(QString preChangeValidationRule); - void modelChangeChanged(QString modelChange); + void modelChangeChanged(QObject *modelChange); protected: virtual void setGroupProperties(); diff --git a/src/duse/qtduseglobal.h b/src/duse/qtduseglobal.h index b39ad15e..28bd26e4 100644 --- a/src/duse/qtduseglobal.h +++ b/src/duse/qtduseglobal.h @@ -48,9 +48,6 @@ #include <QtCore/QSet> #include <QtCore/QString> -Q_DECLARE_METATYPE(QList<QString> *) -Q_DECLARE_METATYPE(QSet<QString> *) - QT_BEGIN_NAMESPACE #ifndef QT_STATIC diff --git a/src/mof/qmofclass.cpp b/src/mof/qmofclass.cpp index a0e720f5..69595773 100644 --- a/src/mof/qmofclass.cpp +++ b/src/mof/qmofclass.cpp @@ -125,6 +125,9 @@ void QMofClass::setAbstract(bool isAbstract) if (_isAbstract != isAbstract) { _isAbstract = isAbstract; _qModelingObject->modifiedResettableProperties() << QStringLiteral("isAbstract"); + + // Adjust redefined properties + QMofClassifier::setAbstract(isAbstract); } } @@ -290,6 +293,9 @@ void QMofClass::addSuperClass(QMofClass *superClass) if (false /* <derivedexclusion-criteria> */) { // <derived-code> + + // Adjust redefined properties + QMofClassifier::addGeneral(superClass); } } @@ -302,6 +308,9 @@ void QMofClass::removeSuperClass(QMofClass *superClass) if (false /* <derivedexclusion-criteria> */) { // <derived-code> + + // Adjust redefined properties + QMofClassifier::removeGeneral(superClass); } } diff --git a/src/mof/qmofenumerationliteral.cpp b/src/mof/qmofenumerationliteral.cpp index b909094d..b20d591c 100644 --- a/src/mof/qmofenumerationliteral.cpp +++ b/src/mof/qmofenumerationliteral.cpp @@ -107,7 +107,14 @@ void QMofEnumerationLiteral::setClassifier(QMofEnumeration *classifier) Q_UNUSED(classifier); if (false /* <derivedexclusion-criteria> */) { + // Adjust redefined properties // QMofInstanceSpecification::removeClassifier(/* <derived-code> */); + // <derived-code> + + // Adjust redefined properties + if (classifier) { + QMofInstanceSpecification::addClassifier(classifier); + } } } diff --git a/src/mof/qmofmultiplicityelement.cpp b/src/mof/qmofmultiplicityelement.cpp index 35389a55..24e3084c 100644 --- a/src/mof/qmofmultiplicityelement.cpp +++ b/src/mof/qmofmultiplicityelement.cpp @@ -174,16 +174,16 @@ void QMofMultiplicityElement::setLowerValue(QMofValueSpecification *lowerValue) /*! Specifies the upper bound of the multiplicity interval. */ -int QMofMultiplicityElement::upper() const +QString QMofMultiplicityElement::upper() const { // This is a read-write derived property qWarning("QMofMultiplicityElement::upper(): to be implemented (this is a derived property)"); - return int(); + return QString(); } -void QMofMultiplicityElement::setUpper(int upper) +void QMofMultiplicityElement::setUpper(QString upper) { // This is a read-write derived property @@ -272,11 +272,11 @@ int QMofMultiplicityElement::lowerBound() const /*! The query upperBound() returns the upper bound of the multiplicity for a bounded multiplicity as an unlimited natural. */ -int QMofMultiplicityElement::upperBound() const +QString QMofMultiplicityElement::upperBound() const { qWarning("QMofMultiplicityElement::upperBound(): to be implemented (operation)"); - return int (); + return QString (); } QT_END_NAMESPACE diff --git a/src/mof/qmofmultiplicityelement.h b/src/mof/qmofmultiplicityelement.h index 9c5ff860..0d113ee0 100644 --- a/src/mof/qmofmultiplicityelement.h +++ b/src/mof/qmofmultiplicityelement.h @@ -67,8 +67,8 @@ public: void setLower(int lower); QMofValueSpecification *lowerValue() const; void setLowerValue(QMofValueSpecification *lowerValue); - int upper() const; - void setUpper(int upper); + QString upper() const; + void setUpper(QString upper); QMofValueSpecification *upperValue() const; void setUpperValue(QMofValueSpecification *upperValue); @@ -77,7 +77,7 @@ public: bool includesMultiplicity(QMofMultiplicityElement *M) const; bool isMultivalued() const; int lowerBound() const; - int upperBound() const; + QString upperBound() const; protected: explicit QMofMultiplicityElement(); diff --git a/src/mof/qmofoperation.cpp b/src/mof/qmofoperation.cpp index 230e5413..0c00d1dd 100644 --- a/src/mof/qmofoperation.cpp +++ b/src/mof/qmofoperation.cpp @@ -323,6 +323,9 @@ void QMofOperation::addOwnedParameter(QMofParameter *ownedParameter) QObject::connect(ownedParameter->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeOwnedParameter(QObject *))); ownedParameter->asQModelingObject()->setParent(this->asQModelingObject()); + // Adjust redefined properties + QMofBehavioralFeature::addOwnedParameter(ownedParameter); + // Adjust opposite properties if (ownedParameter) { ownedParameter->setOperation(this); @@ -339,6 +342,9 @@ void QMofOperation::removeOwnedParameter(QMofParameter *ownedParameter) if (ownedParameter->asQModelingObject()) ownedParameter->asQModelingObject()->setParent(0); + // Adjust redefined properties + QMofBehavioralFeature::removeOwnedParameter(ownedParameter); + // Adjust opposite properties if (ownedParameter) { ownedParameter->setOperation(0); @@ -442,6 +448,9 @@ void QMofOperation::addRaisedException(QMofType *raisedException) _raisedExceptions.insert(raisedException); if (raisedException && raisedException->asQModelingObject() && this->asQModelingObject()) QObject::connect(raisedException->asQModelingObject(), SIGNAL(destroyed(QObject*)), this->asQModelingObject(), SLOT(removeRaisedException(QObject *))); + + // Adjust redefined properties + QMofBehavioralFeature::addRaisedException(raisedException); } } @@ -451,6 +460,9 @@ void QMofOperation::removeRaisedException(QMofType *raisedException) if (_raisedExceptions.contains(raisedException)) { _raisedExceptions.remove(raisedException); + + // Adjust redefined properties + QMofBehavioralFeature::removeRaisedException(raisedException); } } @@ -517,16 +529,16 @@ void QMofOperation::setType(QMofType *type) /*! Specifies the upper multiplicity of the return parameter, if present. */ -int QMofOperation::upper() const +QString QMofOperation::upper() const { // This is a read-only derived property qWarning("QMofOperation::upper(): to be implemented (this is a derived property)"); - return int(); + return QString(); } -void QMofOperation::setUpper(int upper) +void QMofOperation::setUpper(QString upper) { // This is a read-only derived property diff --git a/src/mof/qmofoperation.h b/src/mof/qmofoperation.h index f5518189..05c390d1 100644 --- a/src/mof/qmofoperation.h +++ b/src/mof/qmofoperation.h @@ -97,8 +97,8 @@ public: void removeRedefinedOperation(QMofOperation *redefinedOperation); QMofType *type() const; Q_DECL_HIDDEN void setType(QMofType *type); - int upper() const; - Q_DECL_HIDDEN void setUpper(int upper); + QString upper() const; + Q_DECL_HIDDEN void setUpper(QString upper); // Operations bool isConsistentWith(QMofRedefinableElement *redefinee) const; diff --git a/src/mof/qmofpackageableelement.cpp b/src/mof/qmofpackageableelement.cpp index 64cabd34..b58aec4f 100644 --- a/src/mof/qmofpackageableelement.cpp +++ b/src/mof/qmofpackageableelement.cpp @@ -88,6 +88,9 @@ void QMofPackageableElement::setVisibility(QtMof::VisibilityKind visibility) if (_visibility != visibility) { _visibility = visibility; _qModelingObject->modifiedResettableProperties() << QStringLiteral("visibility"); + + // Adjust redefined properties + QMofNamedElement::setVisibility(visibility); } } diff --git a/src/mof/qmofproperty.cpp b/src/mof/qmofproperty.cpp index aa2205e5..e505a139 100644 --- a/src/mof/qmofproperty.cpp +++ b/src/mof/qmofproperty.cpp @@ -369,6 +369,9 @@ void QMofProperty::setReadOnly(bool isReadOnly) if (_isReadOnly != isReadOnly) { _isReadOnly = isReadOnly; _qModelingObject->modifiedResettableProperties() << QStringLiteral("isReadOnly"); + + // Adjust redefined properties + QMofStructuralFeature::setReadOnly(isReadOnly); } } diff --git a/src/mof/qmofvaluespecification.cpp b/src/mof/qmofvaluespecification.cpp index a423a2e9..7c6a7f0e 100644 --- a/src/mof/qmofvaluespecification.cpp +++ b/src/mof/qmofvaluespecification.cpp @@ -137,11 +137,11 @@ QString QMofValueSpecification::stringValue() const /*! The query unlimitedValue() gives a single UnlimitedNatural value when one can be computed. */ -int QMofValueSpecification::unlimitedValue() const +QString QMofValueSpecification::unlimitedValue() const { qWarning("QMofValueSpecification::unlimitedValue(): to be implemented (operation)"); - return int (); + return QString (); } QT_END_NAMESPACE diff --git a/src/mof/qmofvaluespecification.h b/src/mof/qmofvaluespecification.h index fbbdaa3c..d86d58f2 100644 --- a/src/mof/qmofvaluespecification.h +++ b/src/mof/qmofvaluespecification.h @@ -65,7 +65,7 @@ public: bool isNull() const; double realValue(); QString stringValue() const; - int unlimitedValue() const; + QString unlimitedValue() const; protected: explicit QMofValueSpecification(); diff --git a/src/mof/qobjects/qmofexpressionobject.cpp b/src/mof/qobjects/qmofexpressionobject.cpp index d92118be..92b1a89c 100644 --- a/src/mof/qobjects/qmofexpressionobject.cpp +++ b/src/mof/qobjects/qmofexpressionobject.cpp @@ -230,7 +230,7 @@ QString QMofExpressionObject::stringValue() const return qmodelingelementproperty_cast<QMofExpression *>(this)->stringValue(); } -int QMofExpressionObject::unlimitedValue() const +QString QMofExpressionObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofExpression *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofexpressionobject_p.h b/src/mof/qobjects/qmofexpressionobject_p.h index cc4e3401..b7077322 100644 --- a/src/mof/qobjects/qmofexpressionobject_p.h +++ b/src/mof/qobjects/qmofexpressionobject_p.h @@ -124,7 +124,7 @@ public: Q_INVOKABLE bool isNull() const; Q_INVOKABLE double realValue(); Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/mof/qobjects/qmofinstancevalueobject.cpp b/src/mof/qobjects/qmofinstancevalueobject.cpp index 3e19f7cc..ceb1bfa3 100644 --- a/src/mof/qobjects/qmofinstancevalueobject.cpp +++ b/src/mof/qobjects/qmofinstancevalueobject.cpp @@ -225,7 +225,7 @@ QString QMofInstanceValueObject::stringValue() const return qmodelingelementproperty_cast<QMofInstanceValue *>(this)->stringValue(); } -int QMofInstanceValueObject::unlimitedValue() const +QString QMofInstanceValueObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofInstanceValue *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofinstancevalueobject_p.h b/src/mof/qobjects/qmofinstancevalueobject_p.h index ad401735..11464b7d 100644 --- a/src/mof/qobjects/qmofinstancevalueobject_p.h +++ b/src/mof/qobjects/qmofinstancevalueobject_p.h @@ -122,7 +122,7 @@ public: Q_INVOKABLE bool isNull() const; Q_INVOKABLE double realValue(); Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/mof/qobjects/qmofliteralbooleanobject.cpp b/src/mof/qobjects/qmofliteralbooleanobject.cpp index bfa15295..34307ee9 100644 --- a/src/mof/qobjects/qmofliteralbooleanobject.cpp +++ b/src/mof/qobjects/qmofliteralbooleanobject.cpp @@ -211,7 +211,7 @@ QString QMofLiteralBooleanObject::stringValue() const return qmodelingelementproperty_cast<QMofLiteralBoolean *>(this)->stringValue(); } -int QMofLiteralBooleanObject::unlimitedValue() const +QString QMofLiteralBooleanObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofLiteralBoolean *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofliteralbooleanobject_p.h b/src/mof/qobjects/qmofliteralbooleanobject_p.h index 38ae1576..c7f34e52 100644 --- a/src/mof/qobjects/qmofliteralbooleanobject_p.h +++ b/src/mof/qobjects/qmofliteralbooleanobject_p.h @@ -120,7 +120,7 @@ public: Q_INVOKABLE bool isNull() const; Q_INVOKABLE double realValue(); Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralBoolean] Q_INVOKABLE bool booleanValue() const; diff --git a/src/mof/qobjects/qmofliteralintegerobject.cpp b/src/mof/qobjects/qmofliteralintegerobject.cpp index d38ba9be..aa4bd232 100644 --- a/src/mof/qobjects/qmofliteralintegerobject.cpp +++ b/src/mof/qobjects/qmofliteralintegerobject.cpp @@ -211,7 +211,7 @@ QString QMofLiteralIntegerObject::stringValue() const return qmodelingelementproperty_cast<QMofLiteralInteger *>(this)->stringValue(); } -int QMofLiteralIntegerObject::unlimitedValue() const +QString QMofLiteralIntegerObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofLiteralInteger *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofliteralintegerobject_p.h b/src/mof/qobjects/qmofliteralintegerobject_p.h index 8a7f3834..e7aa0ad9 100644 --- a/src/mof/qobjects/qmofliteralintegerobject_p.h +++ b/src/mof/qobjects/qmofliteralintegerobject_p.h @@ -120,7 +120,7 @@ public: Q_INVOKABLE bool isNull() const; Q_INVOKABLE double realValue(); Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralInteger] Q_INVOKABLE int integerValue() const; diff --git a/src/mof/qobjects/qmofliteralnullobject.cpp b/src/mof/qobjects/qmofliteralnullobject.cpp index 2062914f..45ac8bd5 100644 --- a/src/mof/qobjects/qmofliteralnullobject.cpp +++ b/src/mof/qobjects/qmofliteralnullobject.cpp @@ -204,7 +204,7 @@ QString QMofLiteralNullObject::stringValue() const return qmodelingelementproperty_cast<QMofLiteralNull *>(this)->stringValue(); } -int QMofLiteralNullObject::unlimitedValue() const +QString QMofLiteralNullObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofLiteralNull *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofliteralnullobject_p.h b/src/mof/qobjects/qmofliteralnullobject_p.h index da7ab13d..befbc7ab 100644 --- a/src/mof/qobjects/qmofliteralnullobject_p.h +++ b/src/mof/qobjects/qmofliteralnullobject_p.h @@ -114,7 +114,7 @@ public: Q_INVOKABLE int integerValue() const; Q_INVOKABLE double realValue(); Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralNull] Q_INVOKABLE bool isComputable() const; diff --git a/src/mof/qobjects/qmofliteralrealobject.cpp b/src/mof/qobjects/qmofliteralrealobject.cpp index ce54d4f5..27073dd3 100644 --- a/src/mof/qobjects/qmofliteralrealobject.cpp +++ b/src/mof/qobjects/qmofliteralrealobject.cpp @@ -211,7 +211,7 @@ QString QMofLiteralRealObject::stringValue() const return qmodelingelementproperty_cast<QMofLiteralReal *>(this)->stringValue(); } -int QMofLiteralRealObject::unlimitedValue() const +QString QMofLiteralRealObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofLiteralReal *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofliteralrealobject_p.h b/src/mof/qobjects/qmofliteralrealobject_p.h index 6038748a..03ffe189 100644 --- a/src/mof/qobjects/qmofliteralrealobject_p.h +++ b/src/mof/qobjects/qmofliteralrealobject_p.h @@ -120,7 +120,7 @@ public: Q_INVOKABLE int integerValue() const; Q_INVOKABLE bool isNull() const; Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralReal] Q_INVOKABLE bool isComputable() const; diff --git a/src/mof/qobjects/qmofliteralstringobject.cpp b/src/mof/qobjects/qmofliteralstringobject.cpp index ac4de163..164382b6 100644 --- a/src/mof/qobjects/qmofliteralstringobject.cpp +++ b/src/mof/qobjects/qmofliteralstringobject.cpp @@ -211,7 +211,7 @@ double QMofLiteralStringObject::realValue() return qmodelingelementproperty_cast<QMofLiteralString *>(this)->realValue(); } -int QMofLiteralStringObject::unlimitedValue() const +QString QMofLiteralStringObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofLiteralString *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofliteralstringobject_p.h b/src/mof/qobjects/qmofliteralstringobject_p.h index fbc80888..85390170 100644 --- a/src/mof/qobjects/qmofliteralstringobject_p.h +++ b/src/mof/qobjects/qmofliteralstringobject_p.h @@ -120,7 +120,7 @@ public: Q_INVOKABLE int integerValue() const; Q_INVOKABLE bool isNull() const; Q_INVOKABLE double realValue(); - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralString] Q_INVOKABLE bool isComputable() const; diff --git a/src/mof/qobjects/qmofopaqueexpressionobject.cpp b/src/mof/qobjects/qmofopaqueexpressionobject.cpp index 8ab13732..628b7c18 100644 --- a/src/mof/qobjects/qmofopaqueexpressionobject.cpp +++ b/src/mof/qobjects/qmofopaqueexpressionobject.cpp @@ -226,7 +226,7 @@ QString QMofOpaqueExpressionObject::stringValue() const return qmodelingelementproperty_cast<QMofOpaqueExpression *>(this)->stringValue(); } -int QMofOpaqueExpressionObject::unlimitedValue() const +QString QMofOpaqueExpressionObject::unlimitedValue() const { return qmodelingelementproperty_cast<QMofOpaqueExpression *>(this)->unlimitedValue(); } diff --git a/src/mof/qobjects/qmofopaqueexpressionobject_p.h b/src/mof/qobjects/qmofopaqueexpressionobject_p.h index c3489f08..b8e50861 100644 --- a/src/mof/qobjects/qmofopaqueexpressionobject_p.h +++ b/src/mof/qobjects/qmofopaqueexpressionobject_p.h @@ -124,7 +124,7 @@ public: Q_INVOKABLE bool isNull() const; Q_INVOKABLE double realValue(); Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE int unlimitedValue() const; + Q_INVOKABLE QString unlimitedValue() const; // Operations [OpaqueExpression] Q_INVOKABLE bool isIntegral() const; diff --git a/src/mof/qobjects/qmofoperationobject.cpp b/src/mof/qobjects/qmofoperationobject.cpp index 5701e87d..f8ace9cd 100644 --- a/src/mof/qobjects/qmofoperationobject.cpp +++ b/src/mof/qobjects/qmofoperationobject.cpp @@ -299,7 +299,7 @@ QObject *QMofOperationObject::type() const return qmodelingelementproperty_cast<QMofOperation *>(this)->type()->asQModelingObject(); } -int QMofOperationObject::upper() const +QString QMofOperationObject::upper() const { return qmodelingelementproperty_cast<QMofOperation *>(this)->upper(); } @@ -754,7 +754,7 @@ void QMofOperationObject::setType(QObject *type) emit typeChanged(this->type()); } -void QMofOperationObject::setUpper(int upper) +void QMofOperationObject::setUpper(QString upper) { qmodelingelementproperty_cast<QMofOperation *>(this)->setUpper(upper); emit upperChanged(this->upper()); @@ -763,7 +763,7 @@ void QMofOperationObject::setUpper(int upper) void QMofOperationObject::unsetUpper() { Q_D(QModelingObject); - setUpper(1); + setUpper(QStringLiteral("1")); d->modifiedResettableProperties.removeAll(QStringLiteral("upper")); } diff --git a/src/mof/qobjects/qmofoperationobject_p.h b/src/mof/qobjects/qmofoperationobject_p.h index ca61b1d7..288d07d3 100644 --- a/src/mof/qobjects/qmofoperationobject_p.h +++ b/src/mof/qobjects/qmofoperationobject_p.h @@ -105,7 +105,7 @@ class Q_MOF_EXPORT QMofOperationObject : public QModelingObject Q_PROPERTY(QSet<QObject *> raisedExceptions READ raisedExceptions NOTIFY raisedExceptionsChanged) Q_PROPERTY(QSet<QObject *> redefinedOperations READ redefinedOperations NOTIFY redefinedOperationsChanged) Q_PROPERTY(QObject * type READ type NOTIFY typeChanged STORED false) - Q_PROPERTY(int upper READ upper NOTIFY upperChanged RESET unsetUpper STORED false) + Q_PROPERTY(QString upper READ upper NOTIFY upperChanged RESET unsetUpper STORED false) public: Q_INVOKABLE explicit QMofOperationObject(QMofOperation *modelingElement); @@ -154,7 +154,7 @@ public: Q_INVOKABLE const QSet<QObject *> raisedExceptions() const; Q_INVOKABLE const QSet<QObject *> redefinedOperations() const; Q_INVOKABLE QObject *type() const; - Q_INVOKABLE int upper() const; + Q_INVOKABLE QString upper() const; // Operations [Element] Q_INVOKABLE QSet<QObject *> allOwnedElements() const; @@ -252,7 +252,7 @@ public Q_SLOTS: void addRedefinedOperation(QObject *redefinedOperation); void removeRedefinedOperation(QObject *redefinedOperation); void Q_DECL_HIDDEN setType(QObject *type = 0); - void Q_DECL_HIDDEN setUpper(int upper); + void Q_DECL_HIDDEN setUpper(QString upper); void unsetUpper(); Q_SIGNALS: @@ -301,7 +301,7 @@ Q_SIGNALS: void raisedExceptionsChanged(QSet<QObject *> raisedExceptions); void redefinedOperationsChanged(QSet<QObject *> redefinedOperations); void typeChanged(QObject *type); - void upperChanged(int upper); + void upperChanged(QString upper); protected: virtual void setGroupProperties(); diff --git a/src/mof/qobjects/qmofparameterobject.cpp b/src/mof/qobjects/qmofparameterobject.cpp index ac5d86c4..7e6f016f 100644 --- a/src/mof/qobjects/qmofparameterobject.cpp +++ b/src/mof/qobjects/qmofparameterobject.cpp @@ -147,7 +147,7 @@ QObject *QMofParameterObject::lowerValue() const return qmodelingelementproperty_cast<QMofParameter *>(this)->lowerValue()->asQModelingObject(); } -int QMofParameterObject::upper() const +QString QMofParameterObject::upper() const { return qmodelingelementproperty_cast<QMofParameter *>(this)->upper(); } @@ -271,7 +271,7 @@ int QMofParameterObject::lowerBound() const return qmodelingelementproperty_cast<QMofParameter *>(this)->lowerBound(); } -int QMofParameterObject::upperBound() const +QString QMofParameterObject::upperBound() const { return qmodelingelementproperty_cast<QMofParameter *>(this)->upperBound(); } @@ -390,7 +390,7 @@ void QMofParameterObject::setLowerValue(QObject *lowerValue) emit lowerValueChanged(this->lowerValue()); } -void QMofParameterObject::setUpper(int upper) +void QMofParameterObject::setUpper(QString upper) { qmodelingelementproperty_cast<QMofParameter *>(this)->setUpper(upper); emit upperChanged(this->upper()); @@ -399,7 +399,7 @@ void QMofParameterObject::setUpper(int upper) void QMofParameterObject::unsetUpper() { Q_D(QModelingObject); - setUpper(1); + setUpper(QStringLiteral("1")); d->modifiedResettableProperties.removeAll(QStringLiteral("upper")); } diff --git a/src/mof/qobjects/qmofparameterobject_p.h b/src/mof/qobjects/qmofparameterobject_p.h index 13697ddd..1a349896 100644 --- a/src/mof/qobjects/qmofparameterobject_p.h +++ b/src/mof/qobjects/qmofparameterobject_p.h @@ -80,7 +80,7 @@ class Q_MOF_EXPORT QMofParameterObject : public QModelingObject Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique NOTIFY isUniqueChanged RESET unsetUnique) Q_PROPERTY(int lower READ lower WRITE setLower NOTIFY lowerChanged RESET unsetLower STORED false) Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue NOTIFY lowerValueChanged) - Q_PROPERTY(int upper READ upper WRITE setUpper NOTIFY upperChanged RESET unsetUpper STORED false) + Q_PROPERTY(QString upper READ upper WRITE setUpper NOTIFY upperChanged RESET unsetUpper STORED false) Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue NOTIFY upperValueChanged) // Properties [Parameter] @@ -111,7 +111,7 @@ public: Q_INVOKABLE bool isUnique() const; Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE int upper() const; + Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [Parameter] @@ -138,7 +138,7 @@ public: Q_INVOKABLE bool includesMultiplicity(QObject *M) const; Q_INVOKABLE bool isMultivalued() const; Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE int upperBound() const; + Q_INVOKABLE QString upperBound() const; public Q_SLOTS: @@ -166,7 +166,7 @@ public Q_SLOTS: void setLower(int lower); void unsetLower(); void setLowerValue(QObject *lowerValue = 0); - void setUpper(int upper); + void setUpper(QString upper); void unsetUpper(); void setUpperValue(QObject *upperValue = 0); @@ -198,7 +198,7 @@ Q_SIGNALS: void isUniqueChanged(bool isUnique); void lowerChanged(int lower); void lowerValueChanged(QObject *lowerValue); - void upperChanged(int upper); + void upperChanged(QString upper); void upperValueChanged(QObject *upperValue); // Signals for owned attributes [Parameter] diff --git a/src/mof/qobjects/qmofpropertyobject.cpp b/src/mof/qobjects/qmofpropertyobject.cpp index 41d4b9e0..0a379c31 100644 --- a/src/mof/qobjects/qmofpropertyobject.cpp +++ b/src/mof/qobjects/qmofpropertyobject.cpp @@ -188,7 +188,7 @@ QObject *QMofPropertyObject::lowerValue() const return qmodelingelementproperty_cast<QMofProperty *>(this)->lowerValue()->asQModelingObject(); } -int QMofPropertyObject::upper() const +QString QMofPropertyObject::upper() const { return qmodelingelementproperty_cast<QMofProperty *>(this)->upper(); } @@ -392,7 +392,7 @@ int QMofPropertyObject::lowerBound() const return qmodelingelementproperty_cast<QMofProperty *>(this)->lowerBound(); } -int QMofPropertyObject::upperBound() const +QString QMofPropertyObject::upperBound() const { return qmodelingelementproperty_cast<QMofProperty *>(this)->upperBound(); } @@ -602,7 +602,7 @@ void QMofPropertyObject::setLowerValue(QObject *lowerValue) emit lowerValueChanged(this->lowerValue()); } -void QMofPropertyObject::setUpper(int upper) +void QMofPropertyObject::setUpper(QString upper) { qmodelingelementproperty_cast<QMofProperty *>(this)->setUpper(upper); emit upperChanged(this->upper()); @@ -611,7 +611,7 @@ void QMofPropertyObject::setUpper(int upper) void QMofPropertyObject::unsetUpper() { Q_D(QModelingObject); - setUpper(1); + setUpper(QStringLiteral("1")); d->modifiedResettableProperties.removeAll(QStringLiteral("upper")); } diff --git a/src/mof/qobjects/qmofpropertyobject_p.h b/src/mof/qobjects/qmofpropertyobject_p.h index 7428ed09..a66ee693 100644 --- a/src/mof/qobjects/qmofpropertyobject_p.h +++ b/src/mof/qobjects/qmofpropertyobject_p.h @@ -89,7 +89,7 @@ class Q_MOF_EXPORT QMofPropertyObject : public QModelingObject Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique NOTIFY isUniqueChanged RESET unsetUnique) Q_PROPERTY(int lower READ lower WRITE setLower NOTIFY lowerChanged RESET unsetLower STORED false) Q_PROPERTY(QObject * lowerValue READ lowerValue WRITE setLowerValue NOTIFY lowerValueChanged) - Q_PROPERTY(int upper READ upper WRITE setUpper NOTIFY upperChanged RESET unsetUpper STORED false) + Q_PROPERTY(QString upper READ upper WRITE setUpper NOTIFY upperChanged RESET unsetUpper STORED false) Q_PROPERTY(QObject * upperValue READ upperValue WRITE setUpperValue NOTIFY upperValueChanged) // Properties [StructuralFeature] @@ -142,7 +142,7 @@ public: Q_INVOKABLE bool isUnique() const; Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE int upper() const; + Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [StructuralFeature] @@ -185,7 +185,7 @@ public: Q_INVOKABLE bool includesMultiplicity(QObject *M) const; Q_INVOKABLE bool isMultivalued() const; Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE int upperBound() const; + Q_INVOKABLE QString upperBound() const; // Operations [Property] Q_INVOKABLE bool isAttribute(QObject *p) const; @@ -233,7 +233,7 @@ public Q_SLOTS: void setLower(int lower); void unsetLower(); void setLowerValue(QObject *lowerValue = 0); - void setUpper(int upper); + void setUpper(QString upper); void unsetUpper(); void setUpperValue(QObject *upperValue = 0); @@ -293,7 +293,7 @@ Q_SIGNALS: void isUniqueChanged(bool isUnique); void lowerChanged(int lower); void lowerValueChanged(QObject *lowerValue); - void upperChanged(int upper); + void upperChanged(QString upper); void upperValueChanged(QObject *upperValue); // Signals for owned attributes [StructuralFeature] |