diff options
54 files changed, 126 insertions, 82 deletions
diff --git a/examples/uml/qtumleditor/mainwindow.cpp b/examples/uml/qtumleditor/mainwindow.cpp index be5ff7b8..dd4a0845 100644 --- a/examples/uml/qtumleditor/mainwindow.cpp +++ b/examples/uml/qtumleditor/mainwindow.cpp @@ -38,16 +38,19 @@ MainWindow::MainWindow(QWidget *parent) : loadPlugins(); - QPalette modelPallete = ui->issues->palette(); + QPalette modelPallete = ui->txeIssues->palette(); modelPallete.setColor(QPalette::Active, QPalette::Base, QColor(255, 255, 255)); modelPallete.setColor(QPalette::Inactive, QPalette::Base, QColor(255, 255, 255)); modelPallete.setColor(QPalette::Active, QPalette::AlternateBase, QColor(248, 247, 246)); modelPallete.setColor(QPalette::Inactive, QPalette::AlternateBase, QColor(248, 247, 246)); - ui->issues->setPalette(modelPallete); + ui->txeIssues->setPalette(modelPallete); tabifyDockWidget(ui->dckIssues, ui->dckXPath); tabifyDockWidget(ui->dckXPath, ui->dckOcl); + tabifyDockWidget(ui->dckOcl, ui->dckJavaScript); ui->dckIssues->raise(); + + qScriptRegisterMetaType(&_engine, toScriptValue, fromScriptValue); } MainWindow::~MainWindow() @@ -81,7 +84,9 @@ QWrappedObject *MainWindow::loadXmi() QXmiReader reader; setWindowTitle(QFileInfo(file).fileName() + " - QtUml Editor"); QWrappedObject *wrappedObject = reader.readFile(&file); - ui->issues->setModel(new QStringListModel(reader.errorStrings())); + ui->txeIssues->setModel(new QStringListModel(reader.errorStrings())); + _engine.globalObject().setProperty("model", _engine.newQObject(wrappedObject)); + _engine.globalObject().setProperty(wrappedObject->objectName(), _engine.newQObject(wrappedObject)); return wrappedObject; } @@ -130,6 +135,11 @@ void MainWindow::on_actionAboutPlugins_triggered() _aboutPluginsDialog->exec(); } +void MainWindow::on_psbJSEvaluate_clicked() +{ + ui->txeJavaScriptEvaluation->setText(_engine.evaluate(ui->txeJavaScript->toPlainText()).toString()); +} + void MainWindow::loadPlugins() { QMetaModelPlugin *metaModelPlugin = 0; diff --git a/examples/uml/qtumleditor/mainwindow.h b/examples/uml/qtumleditor/mainwindow.h index 4cdae52c..a19ddc44 100644 --- a/examples/uml/qtumleditor/mainwindow.h +++ b/examples/uml/qtumleditor/mainwindow.h @@ -6,6 +6,8 @@ #include <QtCore/QPair> #include <QtCore/QJsonObject> +#include <QtScript/QScriptEngine> + class QDialog; namespace Ui { @@ -30,6 +32,7 @@ private Q_SLOTS: void on_actionFileSaveAs_triggered(); void on_actionFileSave_triggered(); void on_actionAboutPlugins_triggered(); + void on_psbJSEvaluate_clicked(); private: void loadPlugins(); @@ -43,6 +46,8 @@ private: QHash<QString, QPair<QMetaModelPlugin *, QJsonObject>> _loadedPlugins; QDialog *_aboutPluginsDialog; Ui::AboutPlugins *_aboutPlugins; + + QScriptEngine _engine; }; #endif // MAINWINDOW_H diff --git a/examples/uml/qtumleditor/mainwindow.ui b/examples/uml/qtumleditor/mainwindow.ui index 81cfc60d..75cc301c 100644 --- a/examples/uml/qtumleditor/mainwindow.ui +++ b/examples/uml/qtumleditor/mainwindow.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>704</width> - <height>447</height> + <width>831</width> + <height>474</height> </rect> </property> <property name="windowTitle"> @@ -21,8 +21,8 @@ <rect> <x>0</x> <y>0</y> - <width>704</width> - <height>20</height> + <width>831</width> + <height>19</height> </rect> </property> <widget class="QMenu" name="menu_File"> @@ -98,7 +98,7 @@ <widget class="QWidget" name="dockWidgetContents"> <layout class="QGridLayout" name="gridLayout_4"> <item row="0" column="0"> - <widget class="QListView" name="issues"> + <widget class="QListView" name="txeIssues"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Ignored"> <horstretch>0</horstretch> @@ -175,6 +175,35 @@ </layout> </widget> </widget> + <widget class="QDockWidget" name="dckJavaScript"> + <property name="windowTitle"> + <string>JavaScript Browser</string> + </property> + <attribute name="dockWidgetArea"> + <number>8</number> + </attribute> + <widget class="QWidget" name="dockWidgetContents_4"> + <layout class="QGridLayout" name="gridLayout_7"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTextEdit" name="txeJavaScript"/> + </item> + <item> + <widget class="QPushButton" name="psbJSEvaluate"> + <property name="text"> + <string>&Evaluate</string> + </property> + </widget> + </item> + <item> + <widget class="QTextEdit" name="txeJavaScriptEvaluation"/> + </item> + </layout> + </item> + </layout> + </widget> + </widget> <action name="actionFileNew"> <property name="icon"> <iconset theme="document-new" resource="qtumleditor.qrc"> diff --git a/scripts/templates/class.h b/scripts/templates/class.h index 40e23c08..22790cd5 100644 --- a/scripts/templates/class.h +++ b/scripts/templates/class.h @@ -58,7 +58,7 @@ [%- IF attribute.isReadOnly == 'true' or attribute.accessor.size == 3 %] Q_PROPERTY(${attribute.accessor.0.return.remove('^const ').remove('&$')}[%- IF attribute.accessor.0.return.substr(attribute.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${attribute.accessor.0.name} READ ${attribute.accessor.0.name}[% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) [%- ELSE %] - Q_PROPERTY(${attribute.accessor.0.return}[%- IF attribute.accessor.0.return.substr(attribute.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${attribute.accessor.0.name} READ ${attribute.accessor.0.name} WRITE ${attribute.accessor.1.name}[% IF attribute.defaultValue != '' %] RESET unset${attribute.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) + Q_PROPERTY(${attribute.accessor.0.return}[%- IF attribute.accessor.0.return.substr(attribute.accessor.0.return.length - 1, 1) == '*' -%] [% END -%][%- IF attribute.accessor.0.name.upper != attribute.accessor.0.name -%]${attribute.accessor.0.name.replace('^is', '').lcfirst}[%- ELSE -%]${attribute.accessor.0.name}[%- END -%] READ ${attribute.accessor.0.name} WRITE ${attribute.accessor.1.name}[% IF attribute.defaultValue != '' %] RESET unset${attribute.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) [%- END -%] [%- END -%] [%- END -%] @@ -74,7 +74,7 @@ [%- IF associationend.isReadOnly == 'true' or associationend.accessor.size == 3 %] Q_PROPERTY(${associationend.accessor.0.return.remove('^const ').remove('&$')}[%- IF associationend.accessor.0.return.substr(associationend.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${associationend.accessor.0.name} READ ${associationend.accessor.0.name}[% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) [%- ELSE %] - Q_PROPERTY(${associationend.accessor.0.return}[%- IF associationend.accessor.0.return.substr(associationend.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${associationend.accessor.0.name} READ ${associationend.accessor.0.name} WRITE ${associationend.accessor.1.name}[% IF associationend.defaultValue != '' %] RESET unset${associationend.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) + Q_PROPERTY(${associationend.accessor.0.return}[%- IF associationend.accessor.0.return.substr(associationend.accessor.0.return.length - 1, 1) == '*' -%] [% END -%][%- IF associationend.accessor.0.name.upper != associationend.accessor.0.name -%]${associationend.accessor.0.name.replace('^is', '').lcfirst}[%- ELSE -%]${associationend.accessor.0.name}[%- END -%] READ ${associationend.accessor.0.name} WRITE ${associationend.accessor.1.name}[% IF associationend.defaultValue != '' %] RESET unset${associationend.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) [%- END -%] [%- END -%] [%- END %] diff --git a/src/mof/qassociation.h b/src/mof/qassociation.h index beb9043a..ee4f6b2c 100644 --- a/src/mof/qassociation.h +++ b/src/mof/qassociation.h @@ -68,7 +68,7 @@ class Q_MOF_EXPORT QAssociation : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) + Q_PROPERTY(bool derived READ isDerived WRITE setDerived RESET unsetDerived) Q_PROPERTY(QList<QType *> endTypes READ endTypes STORED false) Q_PROPERTY(QSet<QProperty *> navigableOwnedEnds READ navigableOwnedEnds) Q_PROPERTY(QList<QProperty *> ownedEnds READ ownedEnds) diff --git a/src/mof/qclass.h b/src/mof/qclass.h index 169a73b2..f42ea615 100644 --- a/src/mof/qclass.h +++ b/src/mof/qclass.h @@ -67,7 +67,7 @@ class Q_MOF_EXPORT QClass : public QClassifier { Q_OBJECT - Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) + Q_PROPERTY(bool abstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(QList<QClassifier *> nestedClassifiers READ nestedClassifiers) Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) diff --git a/src/mof/qclassifier.h b/src/mof/qclassifier.h index e6cdf239..b087a675 100644 --- a/src/mof/qclassifier.h +++ b/src/mof/qclassifier.h @@ -70,8 +70,8 @@ class Q_MOF_EXPORT QClassifier : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) + Q_PROPERTY(bool abstract READ isAbstract WRITE setAbstract RESET unsetAbstract) + Q_PROPERTY(bool finalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) Q_PROPERTY(QSet<QProperty *> attributes READ attributes) Q_PROPERTY(QSet<QFeature *> features READ features) Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) diff --git a/src/mof/qfeature.h b/src/mof/qfeature.h index 331ec8e4..ea4aa1d0 100644 --- a/src/mof/qfeature.h +++ b/src/mof/qfeature.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QFeature : public QRedefinableElement { Q_OBJECT - Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) + Q_PROPERTY(bool static READ isStatic WRITE setStatic RESET unsetStatic) Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) Q_DISABLE_COPY(QFeature) diff --git a/src/mof/qgeneralization.h b/src/mof/qgeneralization.h index 7dce1007..7a680897 100644 --- a/src/mof/qgeneralization.h +++ b/src/mof/qgeneralization.h @@ -61,7 +61,7 @@ class Q_MOF_EXPORT QGeneralization : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(bool isSubstitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable) + Q_PROPERTY(bool substitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable) Q_PROPERTY(QClassifier * specific READ specific WRITE setSpecific) Q_PROPERTY(QClassifier * general READ general WRITE setGeneral) diff --git a/src/mof/qmultiplicityelement.h b/src/mof/qmultiplicityelement.h index 75d8a446..35aaba84 100644 --- a/src/mof/qmultiplicityelement.h +++ b/src/mof/qmultiplicityelement.h @@ -62,8 +62,8 @@ class Q_MOF_EXPORT QMultiplicityElement : public QElement Q_OBJECT Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) - Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) - Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) + Q_PROPERTY(bool unique READ isUnique WRITE setUnique RESET unsetUnique) + Q_PROPERTY(bool ordered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) diff --git a/src/mof/qoperation.h b/src/mof/qoperation.h index f54ea915..82ce0d2b 100644 --- a/src/mof/qoperation.h +++ b/src/mof/qoperation.h @@ -71,7 +71,7 @@ class Q_MOF_EXPORT QOperation : public QBehavioralFeature Q_OBJECT Q_PROPERTY(qint32 lower READ lower STORED false) - Q_PROPERTY(bool isQuery READ isQuery WRITE setQuery RESET unsetQuery) + Q_PROPERTY(bool query READ isQuery WRITE setQuery RESET unsetQuery) Q_PROPERTY(bool isUnique READ isUnique STORED false) Q_PROPERTY(qint32 upper READ upper STORED false) Q_PROPERTY(bool isOrdered READ isOrdered STORED false) diff --git a/src/mof/qproperty.h b/src/mof/qproperty.h index 4da7c41f..6666cd5f 100644 --- a/src/mof/qproperty.h +++ b/src/mof/qproperty.h @@ -73,12 +73,12 @@ class Q_MOF_EXPORT QProperty : public QStructuralFeature { Q_OBJECT - Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) + Q_PROPERTY(bool derived READ isDerived WRITE setDerived RESET unsetDerived) Q_PROPERTY(QString default_ READ default_ WRITE setDefault_ STORED false) - Q_PROPERTY(bool isComposite READ isComposite WRITE setComposite STORED false) - Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) - Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID) - Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion) + Q_PROPERTY(bool composite READ isComposite WRITE setComposite STORED false) + Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) + Q_PROPERTY(bool iD READ isID WRITE setID RESET unsetID) + Q_PROPERTY(bool derivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion) Q_PROPERTY(QtMof::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation) Q_PROPERTY(QSet<QProperty *> subsettedProperties READ subsettedProperties) Q_PROPERTY(QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) diff --git a/src/mof/qredefinableelement.h b/src/mof/qredefinableelement.h index 258ed5a4..63cbb728 100644 --- a/src/mof/qredefinableelement.h +++ b/src/mof/qredefinableelement.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QRedefinableElement : public QNamedElement { Q_OBJECT - Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) + Q_PROPERTY(bool leaf READ isLeaf WRITE setLeaf RESET unsetLeaf) Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) diff --git a/src/mof/qstructuralfeature.h b/src/mof/qstructuralfeature.h index e70a1a70..ac11354d 100644 --- a/src/mof/qstructuralfeature.h +++ b/src/mof/qstructuralfeature.h @@ -61,7 +61,7 @@ class Q_MOF_EXPORT QStructuralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) + Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) Q_DISABLE_COPY(QStructuralFeature) Q_DECLARE_PRIVATE(QStructuralFeature) diff --git a/src/uml/qaccepteventaction.h b/src/uml/qaccepteventaction.h index 3ce7e4d2..57bb6c82 100644 --- a/src/uml/qaccepteventaction.h +++ b/src/uml/qaccepteventaction.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QAcceptEventAction : public QAction { Q_OBJECT - Q_PROPERTY(bool isUnmarshall READ isUnmarshall WRITE setUnmarshall RESET unsetUnmarshall) + Q_PROPERTY(bool unmarshall READ isUnmarshall WRITE setUnmarshall RESET unsetUnmarshall) Q_PROPERTY(QSet<QTrigger *> triggers READ triggers) Q_PROPERTY(QSet<QOutputPin *> results READ results) diff --git a/src/uml/qaction.h b/src/uml/qaction.h index 8b9113d7..cb799d28 100644 --- a/src/uml/qaction.h +++ b/src/uml/qaction.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QAction : public QExecutableNode { Q_OBJECT - Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant) + Q_PROPERTY(bool locallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant) Q_PROPERTY(QClassifier * context READ context STORED false) Q_PROPERTY(QSet<QConstraint *> localPostconditions READ localPostconditions) Q_PROPERTY(QSet<QConstraint *> localPreconditions READ localPreconditions) diff --git a/src/uml/qactivity.h b/src/uml/qactivity.h index 21be0e18..8e291284 100644 --- a/src/uml/qactivity.h +++ b/src/uml/qactivity.h @@ -71,8 +71,8 @@ class Q_UML_EXPORT QActivity : public QBehavior { Q_OBJECT - Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) - Q_PROPERTY(bool isSingleExecution READ isSingleExecution WRITE setSingleExecution RESET unsetSingleExecution) + Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) + Q_PROPERTY(bool singleExecution READ isSingleExecution WRITE setSingleExecution RESET unsetSingleExecution) Q_PROPERTY(QSet<QActivityPartition *> partitions READ partitions) Q_PROPERTY(QSet<QActivityNode *> nodes READ nodes) Q_PROPERTY(QSet<QVariable *> variables READ variables) diff --git a/src/uml/qactivitypartition.h b/src/uml/qactivitypartition.h index 147743f7..dd06db5f 100644 --- a/src/uml/qactivitypartition.h +++ b/src/uml/qactivitypartition.h @@ -66,8 +66,8 @@ class Q_UML_EXPORT QActivityPartition : public QActivityGroup { Q_OBJECT - Q_PROPERTY(bool isDimension READ isDimension WRITE setDimension RESET unsetDimension) - Q_PROPERTY(bool isExternal READ isExternal WRITE setExternal RESET unsetExternal) + Q_PROPERTY(bool dimension READ isDimension WRITE setDimension RESET unsetDimension) + Q_PROPERTY(bool external READ isExternal WRITE setExternal RESET unsetExternal) Q_PROPERTY(QElement * represents READ represents WRITE setRepresents) Q_PROPERTY(QSet<QActivityPartition *> subpartitions READ subpartitions) Q_PROPERTY(QActivityPartition * superPartition READ superPartition WRITE setSuperPartition) diff --git a/src/uml/qaddstructuralfeaturevalueaction.h b/src/uml/qaddstructuralfeaturevalueaction.h index 6e58b2f8..aee78276 100644 --- a/src/uml/qaddstructuralfeaturevalueaction.h +++ b/src/uml/qaddstructuralfeaturevalueaction.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QAddStructuralFeatureValueAction : public QWriteStructuralFea { Q_OBJECT - Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) + Q_PROPERTY(bool replaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) Q_PROPERTY(QInputPin * insertAt READ insertAt WRITE setInsertAt) Q_DISABLE_COPY(QAddStructuralFeatureValueAction) diff --git a/src/uml/qaddvariablevalueaction.h b/src/uml/qaddvariablevalueaction.h index fc9a22fc..518314df 100644 --- a/src/uml/qaddvariablevalueaction.h +++ b/src/uml/qaddvariablevalueaction.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QAddVariableValueAction : public QWriteVariableAction { Q_OBJECT - Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) + Q_PROPERTY(bool replaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) Q_PROPERTY(QInputPin * insertAt READ insertAt WRITE setInsertAt) Q_DISABLE_COPY(QAddVariableValueAction) diff --git a/src/uml/qassociation.h b/src/uml/qassociation.h index 08505e1b..209f55fa 100644 --- a/src/uml/qassociation.h +++ b/src/uml/qassociation.h @@ -68,7 +68,7 @@ class Q_UML_EXPORT QAssociation : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) + Q_PROPERTY(bool derived READ isDerived WRITE setDerived RESET unsetDerived) Q_PROPERTY(QList<QType *> endTypes READ endTypes STORED false) Q_PROPERTY(QSet<QProperty *> navigableOwnedEnds READ navigableOwnedEnds) Q_PROPERTY(QList<QProperty *> ownedEnds READ ownedEnds) diff --git a/src/uml/qbehavior.h b/src/uml/qbehavior.h index 0892310d..3ef5d6cb 100644 --- a/src/uml/qbehavior.h +++ b/src/uml/qbehavior.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QBehavior : public QClass { Q_OBJECT - Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant) + Q_PROPERTY(bool reentrant READ isReentrant WRITE setReentrant RESET unsetReentrant) Q_PROPERTY(QBehavioralFeature * specification READ specification WRITE setSpecification) Q_PROPERTY(QSet<QConstraint *> postconditions READ postconditions) Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) diff --git a/src/uml/qbehavioralfeature.h b/src/uml/qbehavioralfeature.h index 87084bd1..ea77d623 100644 --- a/src/uml/qbehavioralfeature.h +++ b/src/uml/qbehavioralfeature.h @@ -75,7 +75,7 @@ class Q_UML_EXPORT QBehavioralFeature : public QWrappedObject Q_OBJECT Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency) - Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) + Q_PROPERTY(bool abstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) Q_PROPERTY(QSet<QParameterSet *> ownedParameterSets READ ownedParameterSets) diff --git a/src/uml/qcallaction.h b/src/uml/qcallaction.h index f8d52653..70da37e7 100644 --- a/src/uml/qcallaction.h +++ b/src/uml/qcallaction.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QCallAction : public QInvocationAction { Q_OBJECT - Q_PROPERTY(bool isSynchronous READ isSynchronous WRITE setSynchronous RESET unsetSynchronous) + Q_PROPERTY(bool synchronous READ isSynchronous WRITE setSynchronous RESET unsetSynchronous) Q_PROPERTY(QList<QOutputPin *> results READ results) Q_DISABLE_COPY(QCallAction) diff --git a/src/uml/qclass.h b/src/uml/qclass.h index c4137dcf..889dfa61 100644 --- a/src/uml/qclass.h +++ b/src/uml/qclass.h @@ -72,8 +72,8 @@ class Q_UML_EXPORT QClass : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive) + Q_PROPERTY(bool abstract READ isAbstract WRITE setAbstract RESET unsetAbstract) + Q_PROPERTY(bool active READ isActive WRITE setActive RESET unsetActive) Q_PROPERTY(QList<QClassifier *> nestedClassifiers READ nestedClassifiers) Q_PROPERTY(QSet<QReception *> ownedReceptions READ ownedReceptions) Q_PROPERTY(QSet<QExtension *> extensions READ extensions STORED false) diff --git a/src/uml/qclassifier.h b/src/uml/qclassifier.h index 9df78ea4..6552640b 100644 --- a/src/uml/qclassifier.h +++ b/src/uml/qclassifier.h @@ -79,8 +79,8 @@ class Q_UML_EXPORT QClassifier : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) + Q_PROPERTY(bool abstract READ isAbstract WRITE setAbstract RESET unsetAbstract) + Q_PROPERTY(bool finalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) Q_PROPERTY(QSet<QUseCase *> ownedUseCases READ ownedUseCases) Q_PROPERTY(QSet<QGeneralizationSet *> powertypeExtents READ powertypeExtents) Q_PROPERTY(QSet<QUseCase *> useCases READ useCases) diff --git a/src/uml/qcomponent.h b/src/uml/qcomponent.h index ad04f237..a7856cd1 100644 --- a/src/uml/qcomponent.h +++ b/src/uml/qcomponent.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QComponent : public QClass { Q_OBJECT - Q_PROPERTY(bool isIndirectlyInstantiated READ isIndirectlyInstantiated WRITE setIndirectlyInstantiated RESET unsetIndirectlyInstantiated) + Q_PROPERTY(bool indirectlyInstantiated READ isIndirectlyInstantiated WRITE setIndirectlyInstantiated RESET unsetIndirectlyInstantiated) Q_PROPERTY(QSet<QComponentRealization *> realizations READ realizations) Q_PROPERTY(QSet<QInterface *> required READ required STORED false) Q_PROPERTY(QSet<QInterface *> provided READ provided STORED false) diff --git a/src/uml/qconditionalnode.h b/src/uml/qconditionalnode.h index 3adba277..b2bcea08 100644 --- a/src/uml/qconditionalnode.h +++ b/src/uml/qconditionalnode.h @@ -66,8 +66,8 @@ class Q_UML_EXPORT QConditionalNode : public QStructuredActivityNode { Q_OBJECT - Q_PROPERTY(bool isAssured READ isAssured WRITE setAssured RESET unsetAssured) - Q_PROPERTY(bool isDeterminate READ isDeterminate WRITE setDeterminate RESET unsetDeterminate) + Q_PROPERTY(bool assured READ isAssured WRITE setAssured RESET unsetAssured) + Q_PROPERTY(bool determinate READ isDeterminate WRITE setDeterminate RESET unsetDeterminate) Q_PROPERTY(QSet<QClause *> clauses READ clauses) Q_PROPERTY(QList<QOutputPin *> results READ results) diff --git a/src/uml/qdestroyobjectaction.h b/src/uml/qdestroyobjectaction.h index 4148c567..21c8d83e 100644 --- a/src/uml/qdestroyobjectaction.h +++ b/src/uml/qdestroyobjectaction.h @@ -61,8 +61,8 @@ class Q_UML_EXPORT QDestroyObjectAction : public QAction { Q_OBJECT - Q_PROPERTY(bool isDestroyLinks READ isDestroyLinks WRITE setDestroyLinks RESET unsetDestroyLinks) - Q_PROPERTY(bool isDestroyOwnedObjects READ isDestroyOwnedObjects WRITE setDestroyOwnedObjects RESET unsetDestroyOwnedObjects) + Q_PROPERTY(bool destroyLinks READ isDestroyLinks WRITE setDestroyLinks RESET unsetDestroyLinks) + Q_PROPERTY(bool destroyOwnedObjects READ isDestroyOwnedObjects WRITE setDestroyOwnedObjects RESET unsetDestroyOwnedObjects) Q_PROPERTY(QInputPin * target READ target WRITE setTarget) Q_DISABLE_COPY(QDestroyObjectAction) diff --git a/src/uml/qfeature.h b/src/uml/qfeature.h index 0bc1c0e2..9255786f 100644 --- a/src/uml/qfeature.h +++ b/src/uml/qfeature.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QFeature : public QRedefinableElement { Q_OBJECT - Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) + Q_PROPERTY(bool static READ isStatic WRITE setStatic RESET unsetStatic) Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) Q_DISABLE_COPY(QFeature) diff --git a/src/uml/qgeneralization.h b/src/uml/qgeneralization.h index 344543fb..261c354c 100644 --- a/src/uml/qgeneralization.h +++ b/src/uml/qgeneralization.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QGeneralization : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(bool isSubstitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable) + Q_PROPERTY(bool substitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable) Q_PROPERTY(QClassifier * specific READ specific WRITE setSpecific) Q_PROPERTY(QSet<QGeneralizationSet *> generalizationSets READ generalizationSets) Q_PROPERTY(QClassifier * general READ general WRITE setGeneral) diff --git a/src/uml/qgeneralizationset.h b/src/uml/qgeneralizationset.h index 1c9d04fe..a10885ae 100644 --- a/src/uml/qgeneralizationset.h +++ b/src/uml/qgeneralizationset.h @@ -65,8 +65,8 @@ class Q_UML_EXPORT QGeneralizationSet : public QPackageableElement { Q_OBJECT - Q_PROPERTY(bool isCovering READ isCovering WRITE setCovering RESET unsetCovering) - Q_PROPERTY(bool isDisjoint READ isDisjoint WRITE setDisjoint RESET unsetDisjoint) + Q_PROPERTY(bool covering READ isCovering WRITE setCovering RESET unsetCovering) + Q_PROPERTY(bool disjoint READ isDisjoint WRITE setDisjoint RESET unsetDisjoint) Q_PROPERTY(QClassifier * powertype READ powertype WRITE setPowertype) Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) diff --git a/src/uml/qjoinnode.h b/src/uml/qjoinnode.h index f016f150..a23143ad 100644 --- a/src/uml/qjoinnode.h +++ b/src/uml/qjoinnode.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QJoinNode : public QControlNode { Q_OBJECT - Q_PROPERTY(bool isCombineDuplicate READ isCombineDuplicate WRITE setCombineDuplicate RESET unsetCombineDuplicate) + Q_PROPERTY(bool combineDuplicate READ isCombineDuplicate WRITE setCombineDuplicate RESET unsetCombineDuplicate) Q_PROPERTY(QValueSpecification * joinSpec READ joinSpec WRITE setJoinSpec) Q_DISABLE_COPY(QJoinNode) diff --git a/src/uml/qlinkendcreationdata.h b/src/uml/qlinkendcreationdata.h index cb58fb6d..2cbb5491 100644 --- a/src/uml/qlinkendcreationdata.h +++ b/src/uml/qlinkendcreationdata.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QLinkEndCreationData : public QLinkEndData { Q_OBJECT - Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) + Q_PROPERTY(bool replaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) Q_PROPERTY(QInputPin * insertAt READ insertAt WRITE setInsertAt) Q_DISABLE_COPY(QLinkEndCreationData) diff --git a/src/uml/qlinkenddestructiondata.h b/src/uml/qlinkenddestructiondata.h index 9cf18e50..31ab877f 100644 --- a/src/uml/qlinkenddestructiondata.h +++ b/src/uml/qlinkenddestructiondata.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QLinkEndDestructionData : public QLinkEndData { Q_OBJECT - Q_PROPERTY(bool isDestroyDuplicates READ isDestroyDuplicates WRITE setDestroyDuplicates RESET unsetDestroyDuplicates) + Q_PROPERTY(bool destroyDuplicates READ isDestroyDuplicates WRITE setDestroyDuplicates RESET unsetDestroyDuplicates) Q_PROPERTY(QInputPin * destroyAt READ destroyAt WRITE setDestroyAt) Q_DISABLE_COPY(QLinkEndDestructionData) diff --git a/src/uml/qloopnode.h b/src/uml/qloopnode.h index 6943d057..e557143e 100644 --- a/src/uml/qloopnode.h +++ b/src/uml/qloopnode.h @@ -67,7 +67,7 @@ class Q_UML_EXPORT QLoopNode : public QStructuredActivityNode { Q_OBJECT - Q_PROPERTY(bool isTestedFirst READ isTestedFirst WRITE setTestedFirst RESET unsetTestedFirst) + Q_PROPERTY(bool testedFirst READ isTestedFirst WRITE setTestedFirst RESET unsetTestedFirst) Q_PROPERTY(QList<QInputPin *> loopVariableInputs READ loopVariableInputs) Q_PROPERTY(QOutputPin * decider READ decider WRITE setDecider) Q_PROPERTY(QList<QOutputPin *> bodyOutputs READ bodyOutputs) diff --git a/src/uml/qmultiplicityelement.h b/src/uml/qmultiplicityelement.h index d2f4279d..632c5fca 100644 --- a/src/uml/qmultiplicityelement.h +++ b/src/uml/qmultiplicityelement.h @@ -62,8 +62,8 @@ class Q_UML_EXPORT QMultiplicityElement : public QElement Q_OBJECT Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) - Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) - Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) + Q_PROPERTY(bool unique READ isUnique WRITE setUnique RESET unsetUnique) + Q_PROPERTY(bool ordered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) diff --git a/src/uml/qobjectflow.h b/src/uml/qobjectflow.h index a87d5905..1fa74125 100644 --- a/src/uml/qobjectflow.h +++ b/src/uml/qobjectflow.h @@ -61,8 +61,8 @@ class Q_UML_EXPORT QObjectFlow : public QActivityEdge { Q_OBJECT - Q_PROPERTY(bool isMultireceive READ isMultireceive WRITE setMultireceive RESET unsetMultireceive) - Q_PROPERTY(bool isMulticast READ isMulticast WRITE setMulticast RESET unsetMulticast) + Q_PROPERTY(bool multireceive READ isMultireceive WRITE setMultireceive RESET unsetMultireceive) + Q_PROPERTY(bool multicast READ isMulticast WRITE setMulticast RESET unsetMulticast) Q_PROPERTY(QBehavior * selection READ selection WRITE setSelection) Q_PROPERTY(QBehavior * transformation READ transformation WRITE setTransformation) diff --git a/src/uml/qobjectnode.h b/src/uml/qobjectnode.h index 47b4492c..64289c3f 100644 --- a/src/uml/qobjectnode.h +++ b/src/uml/qobjectnode.h @@ -71,7 +71,7 @@ class Q_UML_EXPORT QObjectNode : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType) + Q_PROPERTY(bool controlType READ isControlType WRITE setControlType RESET unsetControlType) Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering) Q_PROPERTY(QValueSpecification * upperBound READ upperBound WRITE setUpperBound) Q_PROPERTY(QBehavior * selection READ selection WRITE setSelection) diff --git a/src/uml/qoperation.h b/src/uml/qoperation.h index 79199f0e..dfbecfc3 100644 --- a/src/uml/qoperation.h +++ b/src/uml/qoperation.h @@ -76,7 +76,7 @@ class Q_UML_EXPORT QOperation : public QWrappedObject Q_OBJECT Q_PROPERTY(qint32 lower READ lower STORED false) - Q_PROPERTY(bool isQuery READ isQuery WRITE setQuery RESET unsetQuery) + Q_PROPERTY(bool query READ isQuery WRITE setQuery RESET unsetQuery) Q_PROPERTY(bool isUnique READ isUnique STORED false) Q_PROPERTY(qint32 upper READ upper STORED false) Q_PROPERTY(bool isOrdered READ isOrdered STORED false) diff --git a/src/uml/qparameter.h b/src/uml/qparameter.h index 7c26cd8c..4e6ff108 100644 --- a/src/uml/qparameter.h +++ b/src/uml/qparameter.h @@ -73,10 +73,10 @@ class Q_UML_EXPORT QParameter : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isException READ isException WRITE setException RESET unsetException) + Q_PROPERTY(bool exception READ isException WRITE setException RESET unsetException) Q_PROPERTY(QString default_ READ default_ WRITE setDefault_ STORED false) Q_PROPERTY(QtUml::ParameterDirectionKind direction READ direction WRITE setDirection RESET unsetDirection) - Q_PROPERTY(bool isStream READ isStream WRITE setStream RESET unsetStream) + Q_PROPERTY(bool stream READ isStream WRITE setStream RESET unsetStream) Q_PROPERTY(QtUml::ParameterEffectKind effect READ effect WRITE setEffect) Q_PROPERTY(QOperation * operation READ operation WRITE setOperation) Q_PROPERTY(QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) diff --git a/src/uml/qpin.h b/src/uml/qpin.h index af55acab..d4969dbb 100644 --- a/src/uml/qpin.h +++ b/src/uml/qpin.h @@ -60,7 +60,7 @@ class Q_UML_EXPORT QPin : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl) + Q_PROPERTY(bool control READ isControl WRITE setControl RESET unsetControl) Q_DISABLE_COPY(QPin) Q_DECLARE_PRIVATE(QPin) diff --git a/src/uml/qport.h b/src/uml/qport.h index 66f3082b..1c1007cf 100644 --- a/src/uml/qport.h +++ b/src/uml/qport.h @@ -67,9 +67,9 @@ class Q_UML_EXPORT QPort : public QProperty { Q_OBJECT - Q_PROPERTY(bool isConjugated READ isConjugated WRITE setConjugated RESET unsetConjugated) - Q_PROPERTY(bool isBehavior READ isBehavior WRITE setBehavior RESET unsetBehavior) - Q_PROPERTY(bool isService READ isService WRITE setService RESET unsetService) + Q_PROPERTY(bool conjugated READ isConjugated WRITE setConjugated RESET unsetConjugated) + Q_PROPERTY(bool behavior READ isBehavior WRITE setBehavior RESET unsetBehavior) + Q_PROPERTY(bool service READ isService WRITE setService RESET unsetService) Q_PROPERTY(QProtocolStateMachine * protocol READ protocol WRITE setProtocol) Q_PROPERTY(QSet<QInterface *> required READ required STORED false) Q_PROPERTY(QSet<QInterface *> provided READ provided STORED false) diff --git a/src/uml/qprofileapplication.h b/src/uml/qprofileapplication.h index 5605f0c0..ab934c8e 100644 --- a/src/uml/qprofileapplication.h +++ b/src/uml/qprofileapplication.h @@ -62,7 +62,7 @@ class Q_UML_EXPORT QProfileApplication : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(bool isStrict READ isStrict WRITE setStrict RESET unsetStrict) + Q_PROPERTY(bool strict READ isStrict WRITE setStrict RESET unsetStrict) Q_PROPERTY(QPackage * applyingPackage READ applyingPackage WRITE setApplyingPackage) Q_PROPERTY(QProfile * appliedProfile READ appliedProfile WRITE setAppliedProfile) diff --git a/src/uml/qproperty.h b/src/uml/qproperty.h index f3298d60..7b5cfbd8 100644 --- a/src/uml/qproperty.h +++ b/src/uml/qproperty.h @@ -79,12 +79,12 @@ class Q_UML_EXPORT QProperty : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) + Q_PROPERTY(bool derived READ isDerived WRITE setDerived RESET unsetDerived) Q_PROPERTY(QString default_ READ default_ WRITE setDefault_ STORED false) - Q_PROPERTY(bool isComposite READ isComposite WRITE setComposite RESET unsetComposite STORED false) - Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) - Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID) - Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion) + Q_PROPERTY(bool composite READ isComposite WRITE setComposite RESET unsetComposite STORED false) + Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) + Q_PROPERTY(bool iD READ isID WRITE setID RESET unsetID) + Q_PROPERTY(bool derivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion) Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation) Q_PROPERTY(QSet<QProperty *> subsettedProperties READ subsettedProperties) Q_PROPERTY(QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) diff --git a/src/uml/qreadisclassifiedobjectaction.h b/src/uml/qreadisclassifiedobjectaction.h index 5ebe0a64..dc1a9bb2 100644 --- a/src/uml/qreadisclassifiedobjectaction.h +++ b/src/uml/qreadisclassifiedobjectaction.h @@ -63,7 +63,7 @@ class Q_UML_EXPORT QReadIsClassifiedObjectAction : public QAction { Q_OBJECT - Q_PROPERTY(bool isDirect READ isDirect WRITE setDirect RESET unsetDirect) + Q_PROPERTY(bool direct READ isDirect WRITE setDirect RESET unsetDirect) Q_PROPERTY(QOutputPin * result READ result WRITE setResult) Q_PROPERTY(QInputPin * object READ object WRITE setObject) Q_PROPERTY(QClassifier * classifier READ classifier WRITE setClassifier) diff --git a/src/uml/qreclassifyobjectaction.h b/src/uml/qreclassifyobjectaction.h index 933fce6a..4fdcf43f 100644 --- a/src/uml/qreclassifyobjectaction.h +++ b/src/uml/qreclassifyobjectaction.h @@ -65,7 +65,7 @@ class Q_UML_EXPORT QReclassifyObjectAction : public QAction { Q_OBJECT - Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) + Q_PROPERTY(bool replaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) Q_PROPERTY(QSet<QClassifier *> oldClassifiers READ oldClassifiers) Q_PROPERTY(QInputPin * object READ object WRITE setObject) Q_PROPERTY(QSet<QClassifier *> newClassifiers READ newClassifiers) diff --git a/src/uml/qredefinableelement.h b/src/uml/qredefinableelement.h index b4aaa064..4351bb10 100644 --- a/src/uml/qredefinableelement.h +++ b/src/uml/qredefinableelement.h @@ -64,7 +64,7 @@ class Q_UML_EXPORT QRedefinableElement : public QNamedElement { Q_OBJECT - Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) + Q_PROPERTY(bool leaf READ isLeaf WRITE setLeaf RESET unsetLeaf) Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) diff --git a/src/uml/qreduceaction.h b/src/uml/qreduceaction.h index 380c0cc1..02d2289d 100644 --- a/src/uml/qreduceaction.h +++ b/src/uml/qreduceaction.h @@ -63,7 +63,7 @@ class Q_UML_EXPORT QReduceAction : public QAction { Q_OBJECT - Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) + Q_PROPERTY(bool ordered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(QOutputPin * result READ result WRITE setResult) Q_PROPERTY(QInputPin * collection READ collection WRITE setCollection) Q_PROPERTY(QBehavior * reducer READ reducer WRITE setReducer) diff --git a/src/uml/qremovestructuralfeaturevalueaction.h b/src/uml/qremovestructuralfeaturevalueaction.h index bfd5aec6..14fd8c5d 100644 --- a/src/uml/qremovestructuralfeaturevalueaction.h +++ b/src/uml/qremovestructuralfeaturevalueaction.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QRemoveStructuralFeatureValueAction : public QWriteStructural { Q_OBJECT - Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates) + Q_PROPERTY(bool removeDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates) Q_PROPERTY(QInputPin * removeAt READ removeAt WRITE setRemoveAt) Q_DISABLE_COPY(QRemoveStructuralFeatureValueAction) diff --git a/src/uml/qremovevariablevalueaction.h b/src/uml/qremovevariablevalueaction.h index 8edb4b24..ce7bb2da 100644 --- a/src/uml/qremovevariablevalueaction.h +++ b/src/uml/qremovevariablevalueaction.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QRemoveVariableValueAction : public QWriteVariableAction { Q_OBJECT - Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates) + Q_PROPERTY(bool removeDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates) Q_PROPERTY(QInputPin * removeAt READ removeAt WRITE setRemoveAt) Q_DISABLE_COPY(QRemoveVariableValueAction) diff --git a/src/uml/qstructuralfeature.h b/src/uml/qstructuralfeature.h index 0195c8d7..de2f0f58 100644 --- a/src/uml/qstructuralfeature.h +++ b/src/uml/qstructuralfeature.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QStructuralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) + Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) Q_DISABLE_COPY(QStructuralFeature) Q_DECLARE_PRIVATE(QStructuralFeature) diff --git a/src/uml/qtimeevent.h b/src/uml/qtimeevent.h index 3a14f4c9..a6eff8d2 100644 --- a/src/uml/qtimeevent.h +++ b/src/uml/qtimeevent.h @@ -61,7 +61,7 @@ class Q_UML_EXPORT QTimeEvent : public QEvent { Q_OBJECT - Q_PROPERTY(bool isRelative READ isRelative WRITE setRelative RESET unsetRelative) + Q_PROPERTY(bool relative READ isRelative WRITE setRelative RESET unsetRelative) Q_PROPERTY(QTimeExpression * when READ when WRITE setWhen) Q_DISABLE_COPY(QTimeEvent) diff --git a/src/wrappedobjectswidgets/qwrappedobjectpropertymodel.cpp b/src/wrappedobjectswidgets/qwrappedobjectpropertymodel.cpp index b6acd1e5..4b878842 100644 --- a/src/wrappedobjectswidgets/qwrappedobjectpropertymodel.cpp +++ b/src/wrappedobjectswidgets/qwrappedobjectpropertymodel.cpp @@ -132,7 +132,7 @@ QVariant QWrappedObjectPropertyModel::data(const QModelIndex &index, int role) c case 0: { if (metaPropertyInfo) { QMetaProperty metaProperty = metaPropertyInfo->metaProperty; - QString propertyName = QString::fromLatin1(metaProperty.name()).remove(QRegularExpression(QString::fromLatin1("_$"))).remove(QRegularExpression(QString::fromLatin1("^is"))); + QString propertyName = QString::fromLatin1(metaProperty.name()).remove(QRegularExpression(QString::fromLatin1("_$"))); if (propertyName != propertyName.toUpper()) propertyName = propertyName.replace(0, 1, propertyName.left(1).toLower()); return propertyName.append(QString::fromLatin1(!metaProperty.isWritable() ? " (RO)":"")); |