diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-11-26 12:42:46 -0300 |
|---|---|---|
| committer | Sandro S. Andrade <sandroandrade@kde.org> | 2013-11-26 16:38:10 +0100 |
| commit | 77283562898fbf9499ebece65cc068450433cd95 (patch) | |
| tree | 10b38c6c9a5e5dbe8c5021b33fe889c54dfe5e71 | |
| parent | 0f13b4f396ac21dee5ba1df2cc4cd482b3b41f88 (diff) | |
Update UML metamodel implementation
Change-Id: I1aeaa9b3f30e3d7a94bb665a0a53f7d6dd52de59
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
656 files changed, 3785 insertions, 4624 deletions
diff --git a/src/uml/qobjects/qumlabstractionobject_p.h b/src/uml/qobjects/qumlabstractionobject_p.h index 81979d0d..c5ad7ae4 100644 --- a/src/uml/qobjects/qumlabstractionobject_p.h +++ b/src/uml/qobjects/qumlabstractionobject_p.h @@ -133,13 +133,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlacceptcallactionobject_p.h b/src/uml/qobjects/qumlacceptcallactionobject_p.h index 93225255..9092aaaa 100644 --- a/src/uml/qobjects/qumlacceptcallactionobject_p.h +++ b/src/uml/qobjects/qumlacceptcallactionobject_p.h @@ -141,7 +141,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -162,13 +162,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlaccepteventactionobject_p.h b/src/uml/qobjects/qumlaccepteventactionobject_p.h index 18b09471..d8def8e1 100644 --- a/src/uml/qobjects/qumlaccepteventactionobject_p.h +++ b/src/uml/qobjects/qumlaccepteventactionobject_p.h @@ -138,7 +138,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -156,13 +156,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h b/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h index 8c60ba82..129f34ee 100644 --- a/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h +++ b/src/uml/qobjects/qumlactionexecutionspecificationobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlactioninputpinobject_p.h b/src/uml/qobjects/qumlactioninputpinobject_p.h index a9087430..48573337 100644 --- a/src/uml/qobjects/qumlactioninputpinobject_p.h +++ b/src/uml/qobjects/qumlactioninputpinobject_p.h @@ -122,9 +122,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [NamedElement] @@ -171,23 +171,23 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlactivityfinalnodeobject_p.h b/src/uml/qobjects/qumlactivityfinalnodeobject_p.h index c315d5db..46adac5b 100644 --- a/src/uml/qobjects/qumlactivityfinalnodeobject_p.h +++ b/src/uml/qobjects/qumlactivityfinalnodeobject_p.h @@ -124,13 +124,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlactivityobject_p.h b/src/uml/qobjects/qumlactivityobject_p.h index b22e7087..3dd49bb9 100644 --- a/src/uml/qobjects/qumlactivityobject_p.h +++ b/src/uml/qobjects/qumlactivityobject_p.h @@ -200,7 +200,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -225,17 +225,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Behavior] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE bool isReentrant() const; Q_INVOKABLE const QList<QObject *> ownedParameters() const; Q_INVOKABLE const QSet<QObject *> ownedParameterSets() const; @@ -260,41 +260,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlactivityparameternodeobject_p.h b/src/uml/qobjects/qumlactivityparameternodeobject_p.h index 414b018c..589b808f 100644 --- a/src/uml/qobjects/qumlactivityparameternodeobject_p.h +++ b/src/uml/qobjects/qumlactivityparameternodeobject_p.h @@ -150,13 +150,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlactivitypartitionobject_p.h b/src/uml/qobjects/qumlactivitypartitionobject_p.h index 4029dd00..2a10b0c9 100644 --- a/src/uml/qobjects/qumlactivitypartitionobject_p.h +++ b/src/uml/qobjects/qumlactivitypartitionobject_p.h @@ -126,8 +126,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlactorobject_p.h b/src/uml/qobjects/qumlactorobject_p.h index 564484e5..fcb424fd 100644 --- a/src/uml/qobjects/qumlactorobject_p.h +++ b/src/uml/qobjects/qumlactorobject_p.h @@ -163,9 +163,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -188,39 +188,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h index a3e08a24..08c2ea44 100644 --- a/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h +++ b/src/uml/qobjects/qumladdstructuralfeaturevalueactionobject_p.h @@ -145,7 +145,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -170,13 +170,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumladdvariablevalueactionobject_p.h b/src/uml/qobjects/qumladdvariablevalueactionobject_p.h index 52b29fdd..d57d2083 100644 --- a/src/uml/qobjects/qumladdvariablevalueactionobject_p.h +++ b/src/uml/qobjects/qumladdvariablevalueactionobject_p.h @@ -143,7 +143,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -166,13 +166,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlanyreceiveeventobject_p.h b/src/uml/qobjects/qumlanyreceiveeventobject_p.h index 81f62fef..b3f7e212 100644 --- a/src/uml/qobjects/qumlanyreceiveeventobject_p.h +++ b/src/uml/qobjects/qumlanyreceiveeventobject_p.h @@ -105,13 +105,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlartifactobject_p.h b/src/uml/qobjects/qumlartifactobject_p.h index c037ab51..7845980f 100644 --- a/src/uml/qobjects/qumlartifactobject_p.h +++ b/src/uml/qobjects/qumlartifactobject_p.h @@ -165,9 +165,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -192,39 +192,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlassociationclassobject_p.h b/src/uml/qobjects/qumlassociationclassobject_p.h index eaf24e59..e3af28a4 100644 --- a/src/uml/qobjects/qumlassociationclassobject_p.h +++ b/src/uml/qobjects/qumlassociationclassobject_p.h @@ -190,7 +190,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -215,20 +215,20 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Relationship] Q_INVOKABLE const QSet<QObject *> relatedElements() const; // Owned attributes [Association] - Q_INVOKABLE const QList<QObject *> endTypes() const; + Q_TODO Q_INVOKABLE const QList<QObject *> endTypes() const; Q_INVOKABLE bool isDerived() const; Q_INVOKABLE const QList<QObject *> memberEnds() const; Q_INVOKABLE const QSet<QObject *> navigableOwnedEnds() const; @@ -240,41 +240,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlassociationobject_p.h b/src/uml/qobjects/qumlassociationobject_p.h index 424206de..adff8974 100644 --- a/src/uml/qobjects/qumlassociationobject_p.h +++ b/src/uml/qobjects/qumlassociationobject_p.h @@ -168,9 +168,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -186,7 +186,7 @@ public: Q_INVOKABLE const QSet<QObject *> relatedElements() const; // Owned attributes [Association] - Q_INVOKABLE const QList<QObject *> endTypes() const; + Q_TODO Q_INVOKABLE const QList<QObject *> endTypes() const; Q_INVOKABLE bool isDerived() const; Q_INVOKABLE const QList<QObject *> memberEnds() const; Q_INVOKABLE const QSet<QObject *> navigableOwnedEnds() const; @@ -198,39 +198,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h index fa758167..26ddc80c 100644 --- a/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h +++ b/src/uml/qobjects/qumlbehaviorexecutionspecificationobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h b/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h index 0a70a0c9..d90047de 100644 --- a/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h +++ b/src/uml/qobjects/qumlbroadcastsignalactionobject_p.h @@ -140,7 +140,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -160,13 +160,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcallbehavioractionobject_p.h b/src/uml/qobjects/qumlcallbehavioractionobject_p.h index 83230565..af407fff 100644 --- a/src/uml/qobjects/qumlcallbehavioractionobject_p.h +++ b/src/uml/qobjects/qumlcallbehavioractionobject_p.h @@ -144,7 +144,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -168,13 +168,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcalleventobject_p.h b/src/uml/qobjects/qumlcalleventobject_p.h index 64b6d974..7cd32b40 100644 --- a/src/uml/qobjects/qumlcalleventobject_p.h +++ b/src/uml/qobjects/qumlcalleventobject_p.h @@ -111,13 +111,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcalloperationactionobject_p.h b/src/uml/qobjects/qumlcalloperationactionobject_p.h index 9317a4b7..f44e8517 100644 --- a/src/uml/qobjects/qumlcalloperationactionobject_p.h +++ b/src/uml/qobjects/qumlcalloperationactionobject_p.h @@ -145,7 +145,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -170,13 +170,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcentralbuffernodeobject_p.h b/src/uml/qobjects/qumlcentralbuffernodeobject_p.h index fa0b9406..235dfb00 100644 --- a/src/uml/qobjects/qumlcentralbuffernodeobject_p.h +++ b/src/uml/qobjects/qumlcentralbuffernodeobject_p.h @@ -144,13 +144,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlchangeeventobject_p.h b/src/uml/qobjects/qumlchangeeventobject_p.h index 5102d39a..adae989d 100644 --- a/src/uml/qobjects/qumlchangeeventobject_p.h +++ b/src/uml/qobjects/qumlchangeeventobject_p.h @@ -111,13 +111,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlclassobject_p.h b/src/uml/qobjects/qumlclassobject_p.h index f973ec3f..89f8e545 100644 --- a/src/uml/qobjects/qumlclassobject_p.h +++ b/src/uml/qobjects/qumlclassobject_p.h @@ -180,7 +180,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -205,14 +205,14 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Operations [Element] Q_INVOKABLE QSet<QObject *> allOwnedElements() const; @@ -220,41 +220,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlclearassociationactionobject_p.h b/src/uml/qobjects/qumlclearassociationactionobject_p.h index 3e070b52..fac76257 100644 --- a/src/uml/qobjects/qumlclearassociationactionobject_p.h +++ b/src/uml/qobjects/qumlclearassociationactionobject_p.h @@ -137,7 +137,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -154,13 +154,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h b/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h index 3e448aa8..2c173500 100644 --- a/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h +++ b/src/uml/qobjects/qumlclearstructuralfeatureactionobject_p.h @@ -140,7 +140,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -160,13 +160,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlclearvariableactionobject_p.h b/src/uml/qobjects/qumlclearvariableactionobject_p.h index d960579f..4433f1ea 100644 --- a/src/uml/qobjects/qumlclearvariableactionobject_p.h +++ b/src/uml/qobjects/qumlclearvariableactionobject_p.h @@ -136,7 +136,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -152,13 +152,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcollaborationobject_p.h b/src/uml/qobjects/qumlcollaborationobject_p.h index 27de6914..ce815af4 100644 --- a/src/uml/qobjects/qumlcollaborationobject_p.h +++ b/src/uml/qobjects/qumlcollaborationobject_p.h @@ -172,9 +172,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -206,39 +206,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcollaborationuseobject_p.h b/src/uml/qobjects/qumlcollaborationuseobject_p.h index 60ab957e..23e8441f 100644 --- a/src/uml/qobjects/qumlcollaborationuseobject_p.h +++ b/src/uml/qobjects/qumlcollaborationuseobject_p.h @@ -102,8 +102,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcombinedfragmentobject_p.h b/src/uml/qobjects/qumlcombinedfragmentobject_p.h index f89aba57..5d2bcf54 100644 --- a/src/uml/qobjects/qumlcombinedfragmentobject_p.h +++ b/src/uml/qobjects/qumlcombinedfragmentobject_p.h @@ -116,8 +116,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcommunicationpathobject_p.h b/src/uml/qobjects/qumlcommunicationpathobject_p.h index b777b981..745cd123 100644 --- a/src/uml/qobjects/qumlcommunicationpathobject_p.h +++ b/src/uml/qobjects/qumlcommunicationpathobject_p.h @@ -168,9 +168,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -186,7 +186,7 @@ public: Q_INVOKABLE const QSet<QObject *> relatedElements() const; // Owned attributes [Association] - Q_INVOKABLE const QList<QObject *> endTypes() const; + Q_TODO Q_INVOKABLE const QList<QObject *> endTypes() const; Q_INVOKABLE bool isDerived() const; Q_INVOKABLE const QList<QObject *> memberEnds() const; Q_INVOKABLE const QSet<QObject *> navigableOwnedEnds() const; @@ -198,39 +198,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcomponentobject_p.h b/src/uml/qobjects/qumlcomponentobject_p.h index 5ff0252b..7a67a72a 100644 --- a/src/uml/qobjects/qumlcomponentobject_p.h +++ b/src/uml/qobjects/qumlcomponentobject_p.h @@ -187,7 +187,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -212,14 +212,14 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Component] Q_INVOKABLE bool isIndirectlyInstantiated() const; @@ -234,45 +234,45 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; // Operations [Component] - Q_INVOKABLE QSet<QObject *> realizedInterfaces(QObject *classifier) const; - Q_INVOKABLE QSet<QObject *> usedInterfaces(QObject *classifier) const; + Q_TODO Q_INVOKABLE QSet<QObject *> realizedInterfaces(QObject *classifier) const; + Q_TODO Q_INVOKABLE QSet<QObject *> usedInterfaces(QObject *classifier) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcomponentrealizationobject_p.h b/src/uml/qobjects/qumlcomponentrealizationobject_p.h index a4a2a965..85ccc0bc 100644 --- a/src/uml/qobjects/qumlcomponentrealizationobject_p.h +++ b/src/uml/qobjects/qumlcomponentrealizationobject_p.h @@ -141,13 +141,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlconditionalnodeobject_p.h b/src/uml/qobjects/qumlconditionalnodeobject_p.h index 0a8eddcc..48f474c8 100644 --- a/src/uml/qobjects/qumlconditionalnodeobject_p.h +++ b/src/uml/qobjects/qumlconditionalnodeobject_p.h @@ -159,7 +159,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -200,19 +200,19 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h b/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h index 802b6ce7..7ab2c359 100644 --- a/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h +++ b/src/uml/qobjects/qumlconnectionpointreferenceobject_p.h @@ -100,8 +100,8 @@ public: // Owned attributes [Vertex] Q_INVOKABLE QObject *container() const; - Q_INVOKABLE const QSet<QObject *> incomings() const; - Q_INVOKABLE const QSet<QObject *> outgoings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> incomings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> outgoings() const; // Owned attributes [ConnectionPointReference] Q_INVOKABLE const QSet<QObject *> entries() const; @@ -114,12 +114,12 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Vertex] - Q_INVOKABLE QObject *containingStateMachine() const; + Q_TODO Q_INVOKABLE QObject *containingStateMachine() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlconnectorendobject_p.h b/src/uml/qobjects/qumlconnectorendobject_p.h index 9d325f58..d880537c 100644 --- a/src/uml/qobjects/qumlconnectorendobject_p.h +++ b/src/uml/qobjects/qumlconnectorendobject_p.h @@ -86,13 +86,13 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [ConnectorEnd] - Q_INVOKABLE QObject *definingEnd() const; + Q_TODO Q_INVOKABLE QObject *definingEnd() const; Q_INVOKABLE QObject *partWithPort() const; Q_INVOKABLE QObject *role() const; @@ -101,13 +101,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlconnectorobject_p.h b/src/uml/qobjects/qumlconnectorobject_p.h index 12d8e83f..38ce2a9e 100644 --- a/src/uml/qobjects/qumlconnectorobject_p.h +++ b/src/uml/qobjects/qumlconnectorobject_p.h @@ -126,13 +126,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h b/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h index 4cc020ea..d2cde31a 100644 --- a/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h +++ b/src/uml/qobjects/qumlconsiderignorefragmentobject_p.h @@ -122,8 +122,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlconstraintobject_p.h b/src/uml/qobjects/qumlconstraintobject_p.h index 565d96c1..c3860183 100644 --- a/src/uml/qobjects/qumlconstraintobject_p.h +++ b/src/uml/qobjects/qumlconstraintobject_p.h @@ -115,13 +115,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcontinuationobject_p.h b/src/uml/qobjects/qumlcontinuationobject_p.h index 5401a4d6..e7df3682 100644 --- a/src/uml/qobjects/qumlcontinuationobject_p.h +++ b/src/uml/qobjects/qumlcontinuationobject_p.h @@ -112,8 +112,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcontrolflowobject_p.h b/src/uml/qobjects/qumlcontrolflowobject_p.h index 1841da2e..d83fdfb4 100644 --- a/src/uml/qobjects/qumlcontrolflowobject_p.h +++ b/src/uml/qobjects/qumlcontrolflowobject_p.h @@ -128,13 +128,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcreatelinkactionobject_p.h b/src/uml/qobjects/qumlcreatelinkactionobject_p.h index e24ced08..60640a4f 100644 --- a/src/uml/qobjects/qumlcreatelinkactionobject_p.h +++ b/src/uml/qobjects/qumlcreatelinkactionobject_p.h @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -158,16 +158,16 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [LinkAction] - Q_INVOKABLE QObject *association() const; + Q_TODO Q_INVOKABLE QObject *association() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h b/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h index 23f7dba7..360b706b 100644 --- a/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h +++ b/src/uml/qobjects/qumlcreatelinkobjectactionobject_p.h @@ -142,7 +142,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -164,16 +164,16 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [LinkAction] - Q_INVOKABLE QObject *association() const; + Q_TODO Q_INVOKABLE QObject *association() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlcreateobjectactionobject_p.h b/src/uml/qobjects/qumlcreateobjectactionobject_p.h index 14e72291..014a1ebb 100644 --- a/src/uml/qobjects/qumlcreateobjectactionobject_p.h +++ b/src/uml/qobjects/qumlcreateobjectactionobject_p.h @@ -137,7 +137,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -154,13 +154,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldatastorenodeobject_p.h b/src/uml/qobjects/qumldatastorenodeobject_p.h index 6393877e..84f01059 100644 --- a/src/uml/qobjects/qumldatastorenodeobject_p.h +++ b/src/uml/qobjects/qumldatastorenodeobject_p.h @@ -144,13 +144,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldatatypeobject_p.h b/src/uml/qobjects/qumldatatypeobject_p.h index 50bd05de..9527c781 100644 --- a/src/uml/qobjects/qumldatatypeobject_p.h +++ b/src/uml/qobjects/qumldatatypeobject_p.h @@ -162,9 +162,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -186,41 +186,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [DataType] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldecisionnodeobject_p.h b/src/uml/qobjects/qumldecisionnodeobject_p.h index 59e0f975..f03693d5 100644 --- a/src/uml/qobjects/qumldecisionnodeobject_p.h +++ b/src/uml/qobjects/qumldecisionnodeobject_p.h @@ -132,13 +132,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldependencyobject_p.h b/src/uml/qobjects/qumldependencyobject_p.h index 30af306a..dee655a2 100644 --- a/src/uml/qobjects/qumldependencyobject_p.h +++ b/src/uml/qobjects/qumldependencyobject_p.h @@ -127,13 +127,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldeploymentobject_p.h b/src/uml/qobjects/qumldeploymentobject_p.h index b353289c..215960cd 100644 --- a/src/uml/qobjects/qumldeploymentobject_p.h +++ b/src/uml/qobjects/qumldeploymentobject_p.h @@ -137,13 +137,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldeploymentspecificationobject_p.h b/src/uml/qobjects/qumldeploymentspecificationobject_p.h index 8619ecb7..57bd1d16 100644 --- a/src/uml/qobjects/qumldeploymentspecificationobject_p.h +++ b/src/uml/qobjects/qumldeploymentspecificationobject_p.h @@ -170,9 +170,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -202,39 +202,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldestroylinkactionobject_p.h b/src/uml/qobjects/qumldestroylinkactionobject_p.h index e0a8af36..667cf22b 100644 --- a/src/uml/qobjects/qumldestroylinkactionobject_p.h +++ b/src/uml/qobjects/qumldestroylinkactionobject_p.h @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -158,16 +158,16 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [LinkAction] - Q_INVOKABLE QObject *association() const; + Q_TODO Q_INVOKABLE QObject *association() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldestroyobjectactionobject_p.h b/src/uml/qobjects/qumldestroyobjectactionobject_p.h index 485ab42a..27fa02fe 100644 --- a/src/uml/qobjects/qumldestroyobjectactionobject_p.h +++ b/src/uml/qobjects/qumldestroyobjectactionobject_p.h @@ -138,7 +138,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -156,13 +156,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h b/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h index 2156f63c..e76257bd 100644 --- a/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h +++ b/src/uml/qobjects/qumldestructionoccurrencespecificationobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldeviceobject_p.h b/src/uml/qobjects/qumldeviceobject_p.h index 42983f62..9046c505 100644 --- a/src/uml/qobjects/qumldeviceobject_p.h +++ b/src/uml/qobjects/qumldeviceobject_p.h @@ -187,7 +187,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -212,17 +212,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [Node] @@ -234,41 +234,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldurationconstraintobject_p.h b/src/uml/qobjects/qumldurationconstraintobject_p.h index 5ba6c321..fea1dfc6 100644 --- a/src/uml/qobjects/qumldurationconstraintobject_p.h +++ b/src/uml/qobjects/qumldurationconstraintobject_p.h @@ -125,13 +125,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldurationintervalobject_p.h b/src/uml/qobjects/qumldurationintervalobject_p.h index d88f6212..998978c9 100644 --- a/src/uml/qobjects/qumldurationintervalobject_p.h +++ b/src/uml/qobjects/qumldurationintervalobject_p.h @@ -124,22 +124,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldurationobject_p.h b/src/uml/qobjects/qumldurationobject_p.h index 9a116666..bb2735f6 100644 --- a/src/uml/qobjects/qumldurationobject_p.h +++ b/src/uml/qobjects/qumldurationobject_p.h @@ -120,22 +120,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumldurationobservationobject_p.h b/src/uml/qobjects/qumldurationobservationobject_p.h index 21de8d5c..c5fbd3ee 100644 --- a/src/uml/qobjects/qumldurationobservationobject_p.h +++ b/src/uml/qobjects/qumldurationobservationobject_p.h @@ -113,13 +113,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlelementimportobject_p.h b/src/uml/qobjects/qumlelementimportobject_p.h index 66ab434a..e2890692 100644 --- a/src/uml/qobjects/qumlelementimportobject_p.h +++ b/src/uml/qobjects/qumlelementimportobject_p.h @@ -103,7 +103,7 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ElementImport] - Q_INVOKABLE QString getName() const; + Q_TODO Q_INVOKABLE QString getName() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlenumerationliteralobject_p.h b/src/uml/qobjects/qumlenumerationliteralobject_p.h index 88553016..894a585b 100644 --- a/src/uml/qobjects/qumlenumerationliteralobject_p.h +++ b/src/uml/qobjects/qumlenumerationliteralobject_p.h @@ -113,7 +113,7 @@ public: Q_INVOKABLE QtUml::VisibilityKind visibility() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [InstanceSpecification] @@ -121,7 +121,7 @@ public: Q_INVOKABLE QObject *specification() const; // Owned attributes [EnumerationLiteral] - Q_INVOKABLE QObject *classifier() const; + Q_TODO Q_INVOKABLE QObject *classifier() const; Q_INVOKABLE QObject *enumeration() const; // Operations [Element] @@ -130,13 +130,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlenumerationobject_p.h b/src/uml/qobjects/qumlenumerationobject_p.h index 5fe63600..6b3f0772 100644 --- a/src/uml/qobjects/qumlenumerationobject_p.h +++ b/src/uml/qobjects/qumlenumerationobject_p.h @@ -165,9 +165,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -192,41 +192,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [DataType] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlexecutionenvironmentobject_p.h b/src/uml/qobjects/qumlexecutionenvironmentobject_p.h index c52f3729..ab0c3cbe 100644 --- a/src/uml/qobjects/qumlexecutionenvironmentobject_p.h +++ b/src/uml/qobjects/qumlexecutionenvironmentobject_p.h @@ -187,7 +187,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -212,17 +212,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [Node] @@ -234,41 +234,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h index d21bacfe..2533e62f 100644 --- a/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h +++ b/src/uml/qobjects/qumlexecutionoccurrencespecificationobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlexpansionnodeobject_p.h b/src/uml/qobjects/qumlexpansionnodeobject_p.h index 7085500e..d49ff796 100644 --- a/src/uml/qobjects/qumlexpansionnodeobject_p.h +++ b/src/uml/qobjects/qumlexpansionnodeobject_p.h @@ -152,13 +152,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlexpansionregionobject_p.h b/src/uml/qobjects/qumlexpansionregionobject_p.h index 6603a88e..2140add7 100644 --- a/src/uml/qobjects/qumlexpansionregionobject_p.h +++ b/src/uml/qobjects/qumlexpansionregionobject_p.h @@ -159,7 +159,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -200,19 +200,19 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlexpressionobject_p.h b/src/uml/qobjects/qumlexpressionobject_p.h index fe173acb..c56e35a5 100644 --- a/src/uml/qobjects/qumlexpressionobject_p.h +++ b/src/uml/qobjects/qumlexpressionobject_p.h @@ -120,22 +120,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlextendobject_p.h b/src/uml/qobjects/qumlextendobject_p.h index 502018d5..a3c06038 100644 --- a/src/uml/qobjects/qumlextendobject_p.h +++ b/src/uml/qobjects/qumlextendobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlextensionendobject_p.h b/src/uml/qobjects/qumlextensionendobject_p.h index d1d7fb3c..e5e1e442 100644 --- a/src/uml/qobjects/qumlextensionendobject_p.h +++ b/src/uml/qobjects/qumlextensionendobject_p.h @@ -149,7 +149,7 @@ public: Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [RedefinableElement] @@ -167,11 +167,11 @@ public: Q_INVOKABLE QObject *owningTemplateParameter() const; // Owned attributes [ConnectableElement] - Q_INVOKABLE const QList<QObject *> ends() const; + Q_TODO Q_INVOKABLE const QList<QObject *> ends() const; Q_INVOKABLE QObject *templateParameter() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [Property] @@ -180,7 +180,7 @@ public: Q_INVOKABLE QObject *associationEnd() const; Q_INVOKABLE QObject *class_() const; Q_INVOKABLE QObject *datatype() const; - Q_INVOKABLE QString default_() const; + Q_TODO Q_INVOKABLE QString default_() const; Q_INVOKABLE QObject *defaultValue() const; Q_INVOKABLE QObject *interface_() const; Q_INVOKABLE bool isComposite() const; @@ -188,14 +188,14 @@ public: Q_INVOKABLE bool isDerivedUnion() const; Q_INVOKABLE bool isID() const; Q_INVOKABLE bool isReadOnly() const; - Q_INVOKABLE QObject *opposite() const; + Q_TODO Q_INVOKABLE QObject *opposite() const; Q_INVOKABLE QObject *owningAssociation() const; Q_INVOKABLE const QList<QObject *> qualifiers() const; Q_INVOKABLE const QSet<QObject *> redefinedProperties() const; Q_INVOKABLE const QSet<QObject *> subsettedProperties() const; // Owned attributes [ExtensionEnd] - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *type() const; // Operations [Element] @@ -204,33 +204,33 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Property] - Q_INVOKABLE bool isAttribute(QObject *p) const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isNavigable() const; - Q_INVOKABLE QSet<QObject *> subsettingContext() const; + Q_TODO Q_INVOKABLE bool isAttribute(QObject *p) const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isNavigable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> subsettingContext() const; // Operations [ExtensionEnd] - Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE int lowerBound() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlextensionobject_p.h b/src/uml/qobjects/qumlextensionobject_p.h index 373dc0cd..fa3bdd09 100644 --- a/src/uml/qobjects/qumlextensionobject_p.h +++ b/src/uml/qobjects/qumlextensionobject_p.h @@ -172,9 +172,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -190,14 +190,14 @@ public: Q_INVOKABLE const QSet<QObject *> relatedElements() const; // Owned attributes [Association] - Q_INVOKABLE const QList<QObject *> endTypes() const; + Q_TODO Q_INVOKABLE const QList<QObject *> endTypes() const; Q_INVOKABLE bool isDerived() const; Q_INVOKABLE const QList<QObject *> memberEnds() const; Q_INVOKABLE const QSet<QObject *> navigableOwnedEnds() const; // Owned attributes [Extension] - Q_INVOKABLE bool isRequired() const; - Q_INVOKABLE QObject *metaclass() const; + Q_TODO Q_INVOKABLE bool isRequired() const; + Q_TODO Q_INVOKABLE QObject *metaclass() const; Q_INVOKABLE QObject *ownedEnd() const; // Operations [Element] @@ -206,42 +206,42 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Extension] - Q_INVOKABLE QObject *metaclassEnd() const; + Q_TODO Q_INVOKABLE QObject *metaclassEnd() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlextensionpointobject_p.h b/src/uml/qobjects/qumlextensionpointobject_p.h index 481fcd07..65c9ab2a 100644 --- a/src/uml/qobjects/qumlextensionpointobject_p.h +++ b/src/uml/qobjects/qumlextensionpointobject_p.h @@ -110,13 +110,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlfinalstateobject_p.h b/src/uml/qobjects/qumlfinalstateobject_p.h index d973fbf2..8946f972 100644 --- a/src/uml/qobjects/qumlfinalstateobject_p.h +++ b/src/uml/qobjects/qumlfinalstateobject_p.h @@ -136,8 +136,8 @@ public: // Owned attributes [Vertex] Q_INVOKABLE QObject *container() const; - Q_INVOKABLE const QSet<QObject *> incomings() const; - Q_INVOKABLE const QSet<QObject *> outgoings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> incomings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> outgoings() const; // Owned attributes [State] Q_INVOKABLE const QSet<QObject *> connections() const; @@ -147,11 +147,11 @@ public: Q_INVOKABLE QObject *entry() const; Q_INVOKABLE QObject *exit() const; Q_INVOKABLE bool isComposite() const; - Q_INVOKABLE bool isOrthogonal() const; - Q_INVOKABLE bool isSimple() const; - Q_INVOKABLE bool isSubmachineState() const; + Q_TODO Q_INVOKABLE bool isOrthogonal() const; + Q_TODO Q_INVOKABLE bool isSimple() const; + Q_TODO Q_INVOKABLE bool isSubmachineState() const; Q_INVOKABLE QObject *redefinedState() const; - Q_INVOKABLE QObject *redefinitionContext() const; + Q_TODO Q_INVOKABLE QObject *redefinitionContext() const; Q_INVOKABLE const QSet<QObject *> regions() const; Q_INVOKABLE QObject *stateInvariant() const; Q_INVOKABLE QObject *submachine() const; @@ -162,24 +162,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [RedefinableElement] // Operations [Vertex] // Operations [State] - Q_INVOKABLE QObject *containingStateMachine() const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE QObject *containingStateMachine() const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlflowfinalnodeobject_p.h b/src/uml/qobjects/qumlflowfinalnodeobject_p.h index fd437d74..23b0be96 100644 --- a/src/uml/qobjects/qumlflowfinalnodeobject_p.h +++ b/src/uml/qobjects/qumlflowfinalnodeobject_p.h @@ -124,13 +124,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlforknodeobject_p.h b/src/uml/qobjects/qumlforknodeobject_p.h index efd2b597..4cbc02dd 100644 --- a/src/uml/qobjects/qumlforknodeobject_p.h +++ b/src/uml/qobjects/qumlforknodeobject_p.h @@ -124,13 +124,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlfunctionbehaviorobject_p.h b/src/uml/qobjects/qumlfunctionbehaviorobject_p.h index 5b5a3183..f9677f85 100644 --- a/src/uml/qobjects/qumlfunctionbehaviorobject_p.h +++ b/src/uml/qobjects/qumlfunctionbehaviorobject_p.h @@ -194,7 +194,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -219,17 +219,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Behavior] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE bool isReentrant() const; Q_INVOKABLE const QList<QObject *> ownedParameters() const; Q_INVOKABLE const QSet<QObject *> ownedParameterSets() const; @@ -248,41 +248,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlgateobject_p.h b/src/uml/qobjects/qumlgateobject_p.h index 6e00960a..11434258 100644 --- a/src/uml/qobjects/qumlgateobject_p.h +++ b/src/uml/qobjects/qumlgateobject_p.h @@ -100,8 +100,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlgeneralizationsetobject_p.h b/src/uml/qobjects/qumlgeneralizationsetobject_p.h index 93a96793..85683ecf 100644 --- a/src/uml/qobjects/qumlgeneralizationsetobject_p.h +++ b/src/uml/qobjects/qumlgeneralizationsetobject_p.h @@ -117,13 +117,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlgeneralorderingobject_p.h b/src/uml/qobjects/qumlgeneralorderingobject_p.h index 06db8d67..c968a385 100644 --- a/src/uml/qobjects/qumlgeneralorderingobject_p.h +++ b/src/uml/qobjects/qumlgeneralorderingobject_p.h @@ -102,8 +102,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlincludeobject_p.h b/src/uml/qobjects/qumlincludeobject_p.h index 692dfd4b..0267bd96 100644 --- a/src/uml/qobjects/qumlincludeobject_p.h +++ b/src/uml/qobjects/qumlincludeobject_p.h @@ -116,8 +116,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinformationflowobject_p.h b/src/uml/qobjects/qumlinformationflowobject_p.h index 6eddc3af..7d4ee103 100644 --- a/src/uml/qobjects/qumlinformationflowobject_p.h +++ b/src/uml/qobjects/qumlinformationflowobject_p.h @@ -137,13 +137,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinformationitemobject_p.h b/src/uml/qobjects/qumlinformationitemobject_p.h index f198dc7a..a43b8038 100644 --- a/src/uml/qobjects/qumlinformationitemobject_p.h +++ b/src/uml/qobjects/qumlinformationitemobject_p.h @@ -161,9 +161,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -184,39 +184,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinitialnodeobject_p.h b/src/uml/qobjects/qumlinitialnodeobject_p.h index 2e172609..7d56c978 100644 --- a/src/uml/qobjects/qumlinitialnodeobject_p.h +++ b/src/uml/qobjects/qumlinitialnodeobject_p.h @@ -124,13 +124,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinputpinobject_p.h b/src/uml/qobjects/qumlinputpinobject_p.h index bfc6ada2..be5422f1 100644 --- a/src/uml/qobjects/qumlinputpinobject_p.h +++ b/src/uml/qobjects/qumlinputpinobject_p.h @@ -119,9 +119,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [NamedElement] @@ -165,23 +165,23 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinstancespecificationobject_p.h b/src/uml/qobjects/qumlinstancespecificationobject_p.h index 232306b5..5c0a9af7 100644 --- a/src/uml/qobjects/qumlinstancespecificationobject_p.h +++ b/src/uml/qobjects/qumlinstancespecificationobject_p.h @@ -110,7 +110,7 @@ public: Q_INVOKABLE QtUml::VisibilityKind visibility() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [InstanceSpecification] @@ -124,13 +124,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinstancevalueobject_p.h b/src/uml/qobjects/qumlinstancevalueobject_p.h index 7e9bb3bc..7e86e71f 100644 --- a/src/uml/qobjects/qumlinstancevalueobject_p.h +++ b/src/uml/qobjects/qumlinstancevalueobject_p.h @@ -118,22 +118,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinteractionconstraintobject_p.h b/src/uml/qobjects/qumlinteractionconstraintobject_p.h index 2153451b..c43d3d7a 100644 --- a/src/uml/qobjects/qumlinteractionconstraintobject_p.h +++ b/src/uml/qobjects/qumlinteractionconstraintobject_p.h @@ -123,13 +123,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinteractionobject_p.h b/src/uml/qobjects/qumlinteractionobject_p.h index 80ef77a7..a651f62c 100644 --- a/src/uml/qobjects/qumlinteractionobject_p.h +++ b/src/uml/qobjects/qumlinteractionobject_p.h @@ -203,7 +203,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -228,17 +228,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Behavior] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE bool isReentrant() const; Q_INVOKABLE const QList<QObject *> ownedParameters() const; Q_INVOKABLE const QSet<QObject *> ownedParameterSets() const; @@ -266,41 +266,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinteractionoperandobject_p.h b/src/uml/qobjects/qumlinteractionoperandobject_p.h index 669f1c4d..2350ccfc 100644 --- a/src/uml/qobjects/qumlinteractionoperandobject_p.h +++ b/src/uml/qobjects/qumlinteractionoperandobject_p.h @@ -130,15 +130,15 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinteractionuseobject_p.h b/src/uml/qobjects/qumlinteractionuseobject_p.h index 2a37fb77..e15382b4 100644 --- a/src/uml/qobjects/qumlinteractionuseobject_p.h +++ b/src/uml/qobjects/qumlinteractionuseobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinterfaceobject_p.h b/src/uml/qobjects/qumlinterfaceobject_p.h index 174a9d91..cda4d19d 100644 --- a/src/uml/qobjects/qumlinterfaceobject_p.h +++ b/src/uml/qobjects/qumlinterfaceobject_p.h @@ -166,9 +166,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -194,39 +194,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinterfacerealizationobject_p.h b/src/uml/qobjects/qumlinterfacerealizationobject_p.h index 2d0dd48a..c08a7d6f 100644 --- a/src/uml/qobjects/qumlinterfacerealizationobject_p.h +++ b/src/uml/qobjects/qumlinterfacerealizationobject_p.h @@ -141,13 +141,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h b/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h index f760b8cc..3dc7d262 100644 --- a/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h +++ b/src/uml/qobjects/qumlinterruptibleactivityregionobject_p.h @@ -116,8 +116,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlintervalconstraintobject_p.h b/src/uml/qobjects/qumlintervalconstraintobject_p.h index 6c11c6e5..42b6de8f 100644 --- a/src/uml/qobjects/qumlintervalconstraintobject_p.h +++ b/src/uml/qobjects/qumlintervalconstraintobject_p.h @@ -119,13 +119,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlintervalobject_p.h b/src/uml/qobjects/qumlintervalobject_p.h index 37cd6aff..e4d7dc8d 100644 --- a/src/uml/qobjects/qumlintervalobject_p.h +++ b/src/uml/qobjects/qumlintervalobject_p.h @@ -120,22 +120,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumljoinnodeobject_p.h b/src/uml/qobjects/qumljoinnodeobject_p.h index 25b8617f..1241eebc 100644 --- a/src/uml/qobjects/qumljoinnodeobject_p.h +++ b/src/uml/qobjects/qumljoinnodeobject_p.h @@ -132,13 +132,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumllifelineobject_p.h b/src/uml/qobjects/qumllifelineobject_p.h index 2b965db4..f37d1d7e 100644 --- a/src/uml/qobjects/qumllifelineobject_p.h +++ b/src/uml/qobjects/qumllifelineobject_p.h @@ -108,8 +108,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlliteralbooleanobject_p.h b/src/uml/qobjects/qumlliteralbooleanobject_p.h index d9cd3831..8596eb0e 100644 --- a/src/uml/qobjects/qumlliteralbooleanobject_p.h +++ b/src/uml/qobjects/qumlliteralbooleanobject_p.h @@ -118,24 +118,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralBoolean] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE bool isComputable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlliteralintegerobject_p.h b/src/uml/qobjects/qumlliteralintegerobject_p.h index 1df84bb9..3cdb3e47 100644 --- a/src/uml/qobjects/qumlliteralintegerobject_p.h +++ b/src/uml/qobjects/qumlliteralintegerobject_p.h @@ -118,24 +118,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralInteger] - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isComputable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlliteralnullobject_p.h b/src/uml/qobjects/qumlliteralnullobject_p.h index b48224d4..f7cbdf28 100644 --- a/src/uml/qobjects/qumlliteralnullobject_p.h +++ b/src/uml/qobjects/qumlliteralnullobject_p.h @@ -112,24 +112,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralNull] - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlliteralrealobject_p.h b/src/uml/qobjects/qumlliteralrealobject_p.h index f6178a81..fcf8111c 100644 --- a/src/uml/qobjects/qumlliteralrealobject_p.h +++ b/src/uml/qobjects/qumlliteralrealobject_p.h @@ -118,24 +118,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralReal] - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE double realValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlliteralstringobject_p.h b/src/uml/qobjects/qumlliteralstringobject_p.h index 1c607db8..ee61dede 100644 --- a/src/uml/qobjects/qumlliteralstringobject_p.h +++ b/src/uml/qobjects/qumlliteralstringobject_p.h @@ -118,24 +118,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; // Operations [LiteralString] - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE QString stringValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h b/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h index 0dfddcfe..ba066a51 100644 --- a/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h +++ b/src/uml/qobjects/qumlliteralunlimitednaturalobject_p.h @@ -118,24 +118,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; // Operations [LiteralUnlimitedNatural] - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlloopnodeobject_p.h b/src/uml/qobjects/qumlloopnodeobject_p.h index 127aaa9f..8761cdfe 100644 --- a/src/uml/qobjects/qumlloopnodeobject_p.h +++ b/src/uml/qobjects/qumlloopnodeobject_p.h @@ -163,7 +163,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -208,19 +208,19 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlmanifestationobject_p.h b/src/uml/qobjects/qumlmanifestationobject_p.h index 6bb8c7d3..b9fff687 100644 --- a/src/uml/qobjects/qumlmanifestationobject_p.h +++ b/src/uml/qobjects/qumlmanifestationobject_p.h @@ -139,13 +139,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlmergenodeobject_p.h b/src/uml/qobjects/qumlmergenodeobject_p.h index 9eb4341b..3e435727 100644 --- a/src/uml/qobjects/qumlmergenodeobject_p.h +++ b/src/uml/qobjects/qumlmergenodeobject_p.h @@ -124,13 +124,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlmessageobject_p.h b/src/uml/qobjects/qumlmessageobject_p.h index 338fd4a1..a54ac71d 100644 --- a/src/uml/qobjects/qumlmessageobject_p.h +++ b/src/uml/qobjects/qumlmessageobject_p.h @@ -102,7 +102,7 @@ public: Q_INVOKABLE const QList<QObject *> arguments() const; Q_INVOKABLE QObject *connector() const; Q_INVOKABLE QObject *interaction() const; - Q_INVOKABLE QtUml::MessageKind messageKind() const; + Q_TODO Q_INVOKABLE QtUml::MessageKind messageKind() const; Q_INVOKABLE QtUml::MessageSort messageSort() const; Q_INVOKABLE QObject *receiveEvent() const; Q_INVOKABLE QObject *sendEvent() const; @@ -114,8 +114,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h b/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h index 778fc8d5..d749c172 100644 --- a/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h +++ b/src/uml/qobjects/qumlmessageoccurrencespecificationobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlmodelobject_p.h b/src/uml/qobjects/qumlmodelobject_p.h index 192587c5..675d1121 100644 --- a/src/uml/qobjects/qumlmodelobject_p.h +++ b/src/uml/qobjects/qumlmodelobject_p.h @@ -155,30 +155,30 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [TemplateableElement] - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Package] - Q_INVOKABLE QSet<QObject *> allApplicableStereotypes() const; - Q_INVOKABLE QObject *containingProfile() const; - Q_INVOKABLE bool makesVisible(QObject *el) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allApplicableStereotypes() const; + Q_TODO Q_INVOKABLE QObject *containingProfile() const; + Q_TODO Q_INVOKABLE bool makesVisible(QObject *el) const; Q_INVOKABLE bool mustBeOwned() const; - Q_INVOKABLE QSet<QObject *> visibleMembers() const; + Q_TODO Q_INVOKABLE QSet<QObject *> visibleMembers() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlnodeobject_p.h b/src/uml/qobjects/qumlnodeobject_p.h index 024e7ef8..f8bd355e 100644 --- a/src/uml/qobjects/qumlnodeobject_p.h +++ b/src/uml/qobjects/qumlnodeobject_p.h @@ -187,7 +187,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -212,17 +212,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [Node] @@ -234,41 +234,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlobjectflowobject_p.h b/src/uml/qobjects/qumlobjectflowobject_p.h index a8a6dc2c..6f79ff78 100644 --- a/src/uml/qobjects/qumlobjectflowobject_p.h +++ b/src/uml/qobjects/qumlobjectflowobject_p.h @@ -140,13 +140,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumloccurrencespecificationobject_p.h b/src/uml/qobjects/qumloccurrencespecificationobject_p.h index e1c4f448..d9807b8d 100644 --- a/src/uml/qobjects/qumloccurrencespecificationobject_p.h +++ b/src/uml/qobjects/qumloccurrencespecificationobject_p.h @@ -114,8 +114,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlopaqueactionobject_p.h b/src/uml/qobjects/qumlopaqueactionobject_p.h index 1060729c..7f021ac8 100644 --- a/src/uml/qobjects/qumlopaqueactionobject_p.h +++ b/src/uml/qobjects/qumlopaqueactionobject_p.h @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -158,13 +158,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlopaquebehaviorobject_p.h b/src/uml/qobjects/qumlopaquebehaviorobject_p.h index 668bb1b0..0eac9b67 100644 --- a/src/uml/qobjects/qumlopaquebehaviorobject_p.h +++ b/src/uml/qobjects/qumlopaquebehaviorobject_p.h @@ -194,7 +194,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -219,17 +219,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Behavior] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE bool isReentrant() const; Q_INVOKABLE const QList<QObject *> ownedParameters() const; Q_INVOKABLE const QSet<QObject *> ownedParameterSets() const; @@ -248,41 +248,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlopaqueexpressionobject_p.h b/src/uml/qobjects/qumlopaqueexpressionobject_p.h index ff3c3bfe..29f65f06 100644 --- a/src/uml/qobjects/qumlopaqueexpressionobject_p.h +++ b/src/uml/qobjects/qumlopaqueexpressionobject_p.h @@ -116,7 +116,7 @@ public: Q_INVOKABLE QObject *behavior() const; Q_INVOKABLE const QList<QString> bodies() const; Q_INVOKABLE const QList<QString> languages() const; - Q_INVOKABLE QObject *result() const; + Q_TODO Q_INVOKABLE QObject *result() const; // Operations [Element] Q_INVOKABLE QSet<QObject *> allOwnedElements() const; @@ -124,28 +124,28 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; // Operations [OpaqueExpression] - Q_INVOKABLE bool isIntegral() const; - Q_INVOKABLE bool isNonNegative() const; - Q_INVOKABLE bool isPositive() const; - Q_INVOKABLE int value() const; + Q_TODO Q_INVOKABLE bool isIntegral() const; + Q_TODO Q_INVOKABLE bool isNonNegative() const; + Q_TODO Q_INVOKABLE bool isPositive() const; + Q_TODO Q_INVOKABLE int value() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumloperationobject_p.h b/src/uml/qobjects/qumloperationobject_p.h index 6e43f4e6..d7b449e9 100644 --- a/src/uml/qobjects/qumloperationobject_p.h +++ b/src/uml/qobjects/qumloperationobject_p.h @@ -171,51 +171,51 @@ public: Q_INVOKABLE QObject *class_() const; Q_INVOKABLE QObject *datatype() const; Q_INVOKABLE QObject *interface_() const; - Q_INVOKABLE bool isOrdered() const; + Q_TODO Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isQuery() const; - Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE bool isUnique() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE const QList<QObject *> ownedParameters() const; Q_INVOKABLE const QSet<QObject *> postconditions() const; Q_INVOKABLE const QSet<QObject *> preconditions() const; Q_INVOKABLE const QSet<QObject *> raisedExceptions() const; Q_INVOKABLE const QSet<QObject *> redefinedOperations() const; Q_INVOKABLE QObject *templateParameter() const; - Q_INVOKABLE QObject *type() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QObject *type() const; + Q_TODO Q_INVOKABLE QString upper() const; // Operations [Element] Q_INVOKABLE QSet<QObject *> allOwnedElements() const; Q_INVOKABLE bool mustBeOwned() const; // Operations [TemplateableElement] - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [BehavioralFeature] - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Operation] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE QSet<QObject *> returnResult() const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE QSet<QObject *> returnResult() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumloutputpinobject_p.h b/src/uml/qobjects/qumloutputpinobject_p.h index 942cb83f..aeed058e 100644 --- a/src/uml/qobjects/qumloutputpinobject_p.h +++ b/src/uml/qobjects/qumloutputpinobject_p.h @@ -119,9 +119,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [NamedElement] @@ -165,23 +165,23 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlpackageobject_p.h b/src/uml/qobjects/qumlpackageobject_p.h index 5b7a5260..0443476d 100644 --- a/src/uml/qobjects/qumlpackageobject_p.h +++ b/src/uml/qobjects/qumlpackageobject_p.h @@ -149,30 +149,30 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [TemplateableElement] - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Package] - Q_INVOKABLE QSet<QObject *> allApplicableStereotypes() const; - Q_INVOKABLE QObject *containingProfile() const; - Q_INVOKABLE bool makesVisible(QObject *el) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allApplicableStereotypes() const; + Q_TODO Q_INVOKABLE QObject *containingProfile() const; + Q_TODO Q_INVOKABLE bool makesVisible(QObject *el) const; Q_INVOKABLE bool mustBeOwned() const; - Q_INVOKABLE QSet<QObject *> visibleMembers() const; + Q_TODO Q_INVOKABLE QSet<QObject *> visibleMembers() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlparameterobject_p.h b/src/uml/qobjects/qumlparameterobject_p.h index 9efa897c..1cfb5625 100644 --- a/src/uml/qobjects/qumlparameterobject_p.h +++ b/src/uml/qobjects/qumlparameterobject_p.h @@ -111,9 +111,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [NamedElement] @@ -131,11 +131,11 @@ public: Q_INVOKABLE QObject *owningTemplateParameter() const; // Owned attributes [ConnectableElement] - Q_INVOKABLE const QList<QObject *> ends() const; + Q_TODO Q_INVOKABLE const QList<QObject *> ends() const; Q_INVOKABLE QObject *templateParameter() const; // Owned attributes [Parameter] - Q_INVOKABLE QString default_() const; + Q_TODO Q_INVOKABLE QString default_() const; Q_INVOKABLE QObject *defaultValue() const; Q_INVOKABLE QtUml::ParameterDirectionKind direction() const; Q_INVOKABLE QtUml::ParameterEffectKind effect() const; @@ -149,23 +149,23 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlparametersetobject_p.h b/src/uml/qobjects/qumlparametersetobject_p.h index 94467a2d..b97773c0 100644 --- a/src/uml/qobjects/qumlparametersetobject_p.h +++ b/src/uml/qobjects/qumlparametersetobject_p.h @@ -102,8 +102,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlpartdecompositionobject_p.h b/src/uml/qobjects/qumlpartdecompositionobject_p.h index 002619fa..7cc659fa 100644 --- a/src/uml/qobjects/qumlpartdecompositionobject_p.h +++ b/src/uml/qobjects/qumlpartdecompositionobject_p.h @@ -120,8 +120,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlportobject_p.h b/src/uml/qobjects/qumlportobject_p.h index 375ba9a3..3cb72144 100644 --- a/src/uml/qobjects/qumlportobject_p.h +++ b/src/uml/qobjects/qumlportobject_p.h @@ -156,9 +156,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [RedefinableElement] @@ -176,11 +176,11 @@ public: Q_INVOKABLE QObject *owningTemplateParameter() const; // Owned attributes [ConnectableElement] - Q_INVOKABLE const QList<QObject *> ends() const; + Q_TODO Q_INVOKABLE const QList<QObject *> ends() const; Q_INVOKABLE QObject *templateParameter() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [Property] @@ -189,7 +189,7 @@ public: Q_INVOKABLE QObject *associationEnd() const; Q_INVOKABLE QObject *class_() const; Q_INVOKABLE QObject *datatype() const; - Q_INVOKABLE QString default_() const; + Q_TODO Q_INVOKABLE QString default_() const; Q_INVOKABLE QObject *defaultValue() const; Q_INVOKABLE QObject *interface_() const; Q_INVOKABLE bool isComposite() const; @@ -197,7 +197,7 @@ public: Q_INVOKABLE bool isDerivedUnion() const; Q_INVOKABLE bool isID() const; Q_INVOKABLE bool isReadOnly() const; - Q_INVOKABLE QObject *opposite() const; + Q_TODO Q_INVOKABLE QObject *opposite() const; Q_INVOKABLE QObject *owningAssociation() const; Q_INVOKABLE const QList<QObject *> qualifiers() const; Q_INVOKABLE const QSet<QObject *> redefinedProperties() const; @@ -218,31 +218,31 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Property] - Q_INVOKABLE bool isAttribute(QObject *p) const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isNavigable() const; - Q_INVOKABLE QSet<QObject *> subsettingContext() const; + Q_TODO Q_INVOKABLE bool isAttribute(QObject *p) const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isNavigable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> subsettingContext() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlprimitivetypeobject_p.h b/src/uml/qobjects/qumlprimitivetypeobject_p.h index ad40999d..f604d432 100644 --- a/src/uml/qobjects/qumlprimitivetypeobject_p.h +++ b/src/uml/qobjects/qumlprimitivetypeobject_p.h @@ -162,9 +162,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -186,41 +186,41 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [DataType] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlprofileobject_p.h b/src/uml/qobjects/qumlprofileobject_p.h index 538d7376..01552127 100644 --- a/src/uml/qobjects/qumlprofileobject_p.h +++ b/src/uml/qobjects/qumlprofileobject_p.h @@ -157,30 +157,30 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [TemplateableElement] - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Package] - Q_INVOKABLE QSet<QObject *> allApplicableStereotypes() const; - Q_INVOKABLE QObject *containingProfile() const; - Q_INVOKABLE bool makesVisible(QObject *el) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allApplicableStereotypes() const; + Q_TODO Q_INVOKABLE QObject *containingProfile() const; + Q_TODO Q_INVOKABLE bool makesVisible(QObject *el) const; Q_INVOKABLE bool mustBeOwned() const; - Q_INVOKABLE QSet<QObject *> visibleMembers() const; + Q_TODO Q_INVOKABLE QSet<QObject *> visibleMembers() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlpropertyobject_p.h b/src/uml/qobjects/qumlpropertyobject_p.h index c379cf51..d2fef561 100644 --- a/src/uml/qobjects/qumlpropertyobject_p.h +++ b/src/uml/qobjects/qumlpropertyobject_p.h @@ -147,9 +147,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [RedefinableElement] @@ -167,11 +167,11 @@ public: Q_INVOKABLE QObject *owningTemplateParameter() const; // Owned attributes [ConnectableElement] - Q_INVOKABLE const QList<QObject *> ends() const; + Q_TODO Q_INVOKABLE const QList<QObject *> ends() const; Q_INVOKABLE QObject *templateParameter() const; // Owned attributes [DeploymentTarget] - Q_INVOKABLE const QSet<QObject *> deployedElements() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> deployedElements() const; Q_INVOKABLE const QSet<QObject *> deployments() const; // Owned attributes [Property] @@ -180,7 +180,7 @@ public: Q_INVOKABLE QObject *associationEnd() const; Q_INVOKABLE QObject *class_() const; Q_INVOKABLE QObject *datatype() const; - Q_INVOKABLE QString default_() const; + Q_TODO Q_INVOKABLE QString default_() const; Q_INVOKABLE QObject *defaultValue() const; Q_INVOKABLE QObject *interface_() const; Q_INVOKABLE bool isComposite() const; @@ -188,7 +188,7 @@ public: Q_INVOKABLE bool isDerivedUnion() const; Q_INVOKABLE bool isID() const; Q_INVOKABLE bool isReadOnly() const; - Q_INVOKABLE QObject *opposite() const; + Q_TODO Q_INVOKABLE QObject *opposite() const; Q_INVOKABLE QObject *owningAssociation() const; Q_INVOKABLE const QList<QObject *> qualifiers() const; Q_INVOKABLE const QSet<QObject *> redefinedProperties() const; @@ -200,31 +200,31 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Property] - Q_INVOKABLE bool isAttribute(QObject *p) const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isNavigable() const; - Q_INVOKABLE QSet<QObject *> subsettingContext() const; + Q_TODO Q_INVOKABLE bool isAttribute(QObject *p) const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isNavigable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> subsettingContext() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlprotocolstatemachineobject_p.h b/src/uml/qobjects/qumlprotocolstatemachineobject_p.h index 7cccdc49..5c897b85 100644 --- a/src/uml/qobjects/qumlprotocolstatemachineobject_p.h +++ b/src/uml/qobjects/qumlprotocolstatemachineobject_p.h @@ -198,7 +198,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -223,17 +223,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Behavior] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE bool isReentrant() const; Q_INVOKABLE const QList<QObject *> ownedParameters() const; Q_INVOKABLE const QSet<QObject *> ownedParameterSets() const; @@ -256,45 +256,45 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; // Operations [StateMachine] - Q_INVOKABLE QObject *LCA(QObject *s1, QObject *s2) const; - Q_INVOKABLE bool ancestor(QObject *s1, QObject *s2) const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE QObject *LCA(QObject *s1, QObject *s2) const; + Q_TODO Q_INVOKABLE bool ancestor(QObject *s1, QObject *s2) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlprotocoltransitionobject_p.h b/src/uml/qobjects/qumlprotocoltransitionobject_p.h index 7d3b088e..b8600674 100644 --- a/src/uml/qobjects/qumlprotocoltransitionobject_p.h +++ b/src/uml/qobjects/qumlprotocoltransitionobject_p.h @@ -134,7 +134,7 @@ public: Q_INVOKABLE QObject *guard() const; Q_INVOKABLE QtUml::TransitionKind kind() const; Q_INVOKABLE QObject *redefinedTransition() const; - Q_INVOKABLE QObject *redefinitionContext() const; + Q_TODO Q_INVOKABLE QObject *redefinitionContext() const; Q_INVOKABLE QObject *source() const; Q_INVOKABLE QObject *target() const; Q_INVOKABLE const QSet<QObject *> triggers() const; @@ -142,7 +142,7 @@ public: // Owned attributes [ProtocolTransition] Q_INVOKABLE QObject *postCondition() const; Q_INVOKABLE QObject *preCondition() const; - Q_INVOKABLE const QSet<QObject *> referred() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> referred() const; // Operations [Element] Q_INVOKABLE QSet<QObject *> allOwnedElements() const; @@ -150,22 +150,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [Transition] - Q_INVOKABLE QObject *containingStateMachine() const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE QObject *containingStateMachine() const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlpseudostateobject_p.h b/src/uml/qobjects/qumlpseudostateobject_p.h index 82bc955d..2308dfd9 100644 --- a/src/uml/qobjects/qumlpseudostateobject_p.h +++ b/src/uml/qobjects/qumlpseudostateobject_p.h @@ -100,8 +100,8 @@ public: // Owned attributes [Vertex] Q_INVOKABLE QObject *container() const; - Q_INVOKABLE const QSet<QObject *> incomings() const; - Q_INVOKABLE const QSet<QObject *> outgoings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> incomings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> outgoings() const; // Owned attributes [Pseudostate] Q_INVOKABLE QtUml::PseudostateKind kind() const; @@ -114,12 +114,12 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Vertex] - Q_INVOKABLE QObject *containingStateMachine() const; + Q_TODO Q_INVOKABLE QObject *containingStateMachine() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlraiseexceptionactionobject_p.h b/src/uml/qobjects/qumlraiseexceptionactionobject_p.h index aee4138d..f7621f7b 100644 --- a/src/uml/qobjects/qumlraiseexceptionactionobject_p.h +++ b/src/uml/qobjects/qumlraiseexceptionactionobject_p.h @@ -136,7 +136,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -152,13 +152,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadextentactionobject_p.h b/src/uml/qobjects/qumlreadextentactionobject_p.h index 5c8c06d2..8b138704 100644 --- a/src/uml/qobjects/qumlreadextentactionobject_p.h +++ b/src/uml/qobjects/qumlreadextentactionobject_p.h @@ -137,7 +137,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -154,13 +154,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h index 2ed51e1a..226f7be7 100644 --- a/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h +++ b/src/uml/qobjects/qumlreadisclassifiedobjectactionobject_p.h @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -158,13 +158,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadlinkactionobject_p.h b/src/uml/qobjects/qumlreadlinkactionobject_p.h index e03ae1fd..2bc1e467 100644 --- a/src/uml/qobjects/qumlreadlinkactionobject_p.h +++ b/src/uml/qobjects/qumlreadlinkactionobject_p.h @@ -140,7 +140,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -160,16 +160,16 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [LinkAction] - Q_INVOKABLE QObject *association() const; + Q_TODO Q_INVOKABLE QObject *association() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h b/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h index 43af855c..03ac110d 100644 --- a/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h +++ b/src/uml/qobjects/qumlreadlinkobjectendactionobject_p.h @@ -138,7 +138,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -156,13 +156,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h index 973f60c3..35403249 100644 --- a/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h +++ b/src/uml/qobjects/qumlreadlinkobjectendqualifieractionobject_p.h @@ -138,7 +138,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -156,13 +156,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadselfactionobject_p.h b/src/uml/qobjects/qumlreadselfactionobject_p.h index 5d1bf2b5..8b54cb2a 100644 --- a/src/uml/qobjects/qumlreadselfactionobject_p.h +++ b/src/uml/qobjects/qumlreadselfactionobject_p.h @@ -136,7 +136,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -152,13 +152,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h b/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h index 8e0241bd..29180b65 100644 --- a/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h +++ b/src/uml/qobjects/qumlreadstructuralfeatureactionobject_p.h @@ -140,7 +140,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -160,13 +160,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreadvariableactionobject_p.h b/src/uml/qobjects/qumlreadvariableactionobject_p.h index b5cff5ae..7c4b2dd5 100644 --- a/src/uml/qobjects/qumlreadvariableactionobject_p.h +++ b/src/uml/qobjects/qumlreadvariableactionobject_p.h @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -158,13 +158,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlrealizationobject_p.h b/src/uml/qobjects/qumlrealizationobject_p.h index d6fc2c76..d202b656 100644 --- a/src/uml/qobjects/qumlrealizationobject_p.h +++ b/src/uml/qobjects/qumlrealizationobject_p.h @@ -133,13 +133,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreceptionobject_p.h b/src/uml/qobjects/qumlreceptionobject_p.h index f1d9503f..dc545d17 100644 --- a/src/uml/qobjects/qumlreceptionobject_p.h +++ b/src/uml/qobjects/qumlreceptionobject_p.h @@ -150,21 +150,21 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [BehavioralFeature] - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h b/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h index 7ffa133f..42002c23 100644 --- a/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h +++ b/src/uml/qobjects/qumlreclassifyobjectactionobject_p.h @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -158,13 +158,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h b/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h index 9eb7aa20..7cfc5fd9 100644 --- a/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h +++ b/src/uml/qobjects/qumlredefinabletemplatesignatureobject_p.h @@ -116,7 +116,7 @@ public: // Owned attributes [RedefinableTemplateSignature] Q_INVOKABLE QObject *classifier() const; Q_INVOKABLE const QSet<QObject *> extendedSignatures() const; - Q_INVOKABLE const QSet<QObject *> inheritedParameters() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedParameters() const; // Operations [Element] Q_INVOKABLE QSet<QObject *> allOwnedElements() const; @@ -124,15 +124,15 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [RedefinableTemplateSignature] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreduceactionobject_p.h b/src/uml/qobjects/qumlreduceactionobject_p.h index 294cfb4c..9857d929 100644 --- a/src/uml/qobjects/qumlreduceactionobject_p.h +++ b/src/uml/qobjects/qumlreduceactionobject_p.h @@ -139,7 +139,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -158,13 +158,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlregionobject_p.h b/src/uml/qobjects/qumlregionobject_p.h index 9e99ce38..2e182cf3 100644 --- a/src/uml/qobjects/qumlregionobject_p.h +++ b/src/uml/qobjects/qumlregionobject_p.h @@ -122,7 +122,7 @@ public: // Owned attributes [Region] Q_INVOKABLE QObject *extendedRegion() const; - Q_INVOKABLE QObject *redefinitionContext() const; + Q_TODO Q_INVOKABLE QObject *redefinitionContext() const; Q_INVOKABLE QObject *state() const; Q_INVOKABLE QObject *stateMachine() const; Q_INVOKABLE const QSet<QObject *> subvertices() const; @@ -134,23 +134,23 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [Region] - Q_INVOKABLE bool belongsToPSM() const; - Q_INVOKABLE QObject *containingStateMachine() const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool belongsToPSM() const; + Q_TODO Q_INVOKABLE QObject *containingStateMachine() const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h index f247a2ae..36c35496 100644 --- a/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h +++ b/src/uml/qobjects/qumlremovestructuralfeaturevalueactionobject_p.h @@ -145,7 +145,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -170,13 +170,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h b/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h index 7ce198a7..f2b440a0 100644 --- a/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h +++ b/src/uml/qobjects/qumlremovevariablevalueactionobject_p.h @@ -143,7 +143,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -166,13 +166,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlreplyactionobject_p.h b/src/uml/qobjects/qumlreplyactionobject_p.h index e179d398..033839b4 100644 --- a/src/uml/qobjects/qumlreplyactionobject_p.h +++ b/src/uml/qobjects/qumlreplyactionobject_p.h @@ -138,7 +138,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -156,13 +156,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlsendobjectactionobject_p.h b/src/uml/qobjects/qumlsendobjectactionobject_p.h index cb8aea74..20c28a8b 100644 --- a/src/uml/qobjects/qumlsendobjectactionobject_p.h +++ b/src/uml/qobjects/qumlsendobjectactionobject_p.h @@ -140,7 +140,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -160,13 +160,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlsendsignalactionobject_p.h b/src/uml/qobjects/qumlsendsignalactionobject_p.h index afe4a1ae..981080a8 100644 --- a/src/uml/qobjects/qumlsendsignalactionobject_p.h +++ b/src/uml/qobjects/qumlsendsignalactionobject_p.h @@ -141,7 +141,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -162,13 +162,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlsequencenodeobject_p.h b/src/uml/qobjects/qumlsequencenodeobject_p.h index 019ac190..9c88f055 100644 --- a/src/uml/qobjects/qumlsequencenodeobject_p.h +++ b/src/uml/qobjects/qumlsequencenodeobject_p.h @@ -156,7 +156,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -194,19 +194,19 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlsignaleventobject_p.h b/src/uml/qobjects/qumlsignaleventobject_p.h index 2898036f..5dad17f4 100644 --- a/src/uml/qobjects/qumlsignaleventobject_p.h +++ b/src/uml/qobjects/qumlsignaleventobject_p.h @@ -111,13 +111,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlsignalobject_p.h b/src/uml/qobjects/qumlsignalobject_p.h index 07e0a3a4..fe983210 100644 --- a/src/uml/qobjects/qumlsignalobject_p.h +++ b/src/uml/qobjects/qumlsignalobject_p.h @@ -161,9 +161,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -184,39 +184,39 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h b/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h index c8577f40..91a3299a 100644 --- a/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h +++ b/src/uml/qobjects/qumlstartclassifierbehavioractionobject_p.h @@ -136,7 +136,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -152,13 +152,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h b/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h index a810e213..0fdcc054 100644 --- a/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h +++ b/src/uml/qobjects/qumlstartobjectbehavioractionobject_p.h @@ -144,7 +144,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -168,13 +168,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstateinvariantobject_p.h b/src/uml/qobjects/qumlstateinvariantobject_p.h index 40e64469..df8a082a 100644 --- a/src/uml/qobjects/qumlstateinvariantobject_p.h +++ b/src/uml/qobjects/qumlstateinvariantobject_p.h @@ -112,8 +112,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstatemachineobject_p.h b/src/uml/qobjects/qumlstatemachineobject_p.h index 814b2710..ed0ded72 100644 --- a/src/uml/qobjects/qumlstatemachineobject_p.h +++ b/src/uml/qobjects/qumlstatemachineobject_p.h @@ -195,7 +195,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -220,17 +220,17 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Behavior] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE bool isReentrant() const; Q_INVOKABLE const QList<QObject *> ownedParameters() const; Q_INVOKABLE const QSet<QObject *> ownedParameterSets() const; @@ -250,45 +250,45 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; // Operations [StateMachine] - Q_INVOKABLE QObject *LCA(QObject *s1, QObject *s2) const; - Q_INVOKABLE bool ancestor(QObject *s1, QObject *s2) const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE QObject *LCA(QObject *s1, QObject *s2) const; + Q_TODO Q_INVOKABLE bool ancestor(QObject *s1, QObject *s2) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstateobject_p.h b/src/uml/qobjects/qumlstateobject_p.h index 5d113bc0..f7df24c8 100644 --- a/src/uml/qobjects/qumlstateobject_p.h +++ b/src/uml/qobjects/qumlstateobject_p.h @@ -136,8 +136,8 @@ public: // Owned attributes [Vertex] Q_INVOKABLE QObject *container() const; - Q_INVOKABLE const QSet<QObject *> incomings() const; - Q_INVOKABLE const QSet<QObject *> outgoings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> incomings() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> outgoings() const; // Owned attributes [State] Q_INVOKABLE const QSet<QObject *> connections() const; @@ -147,11 +147,11 @@ public: Q_INVOKABLE QObject *entry() const; Q_INVOKABLE QObject *exit() const; Q_INVOKABLE bool isComposite() const; - Q_INVOKABLE bool isOrthogonal() const; - Q_INVOKABLE bool isSimple() const; - Q_INVOKABLE bool isSubmachineState() const; + Q_TODO Q_INVOKABLE bool isOrthogonal() const; + Q_TODO Q_INVOKABLE bool isSimple() const; + Q_TODO Q_INVOKABLE bool isSubmachineState() const; Q_INVOKABLE QObject *redefinedState() const; - Q_INVOKABLE QObject *redefinitionContext() const; + Q_TODO Q_INVOKABLE QObject *redefinitionContext() const; Q_INVOKABLE const QSet<QObject *> regions() const; Q_INVOKABLE QObject *stateInvariant() const; Q_INVOKABLE QObject *submachine() const; @@ -162,24 +162,24 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [RedefinableElement] // Operations [Vertex] // Operations [State] - Q_INVOKABLE QObject *containingStateMachine() const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE QObject *containingStateMachine() const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstereotypeobject_p.h b/src/uml/qobjects/qumlstereotypeobject_p.h index c3f690b7..e9358c8b 100644 --- a/src/uml/qobjects/qumlstereotypeobject_p.h +++ b/src/uml/qobjects/qumlstereotypeobject_p.h @@ -184,7 +184,7 @@ public: Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; Q_INVOKABLE const QSet<QObject *> ownedUseCases() const; @@ -209,18 +209,18 @@ public: Q_INVOKABLE const QSet<QObject *> ownedBehaviors() const; // Owned attributes [Class] - Q_INVOKABLE const QSet<QObject *> extensions() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> extensions() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isActive() const; Q_INVOKABLE const QList<QObject *> nestedClassifiers() const; Q_INVOKABLE const QList<QObject *> ownedAttributes() const; Q_INVOKABLE const QList<QObject *> ownedOperations() const; Q_INVOKABLE const QSet<QObject *> ownedReceptions() const; - Q_INVOKABLE const QSet<QObject *> superClasses() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> superClasses() const; // Owned attributes [Stereotype] Q_INVOKABLE const QSet<QObject *> icons() const; - Q_INVOKABLE QObject *profile() const; + Q_TODO Q_INVOKABLE QObject *profile() const; // Operations [Element] Q_INVOKABLE QSet<QObject *> allOwnedElements() const; @@ -228,44 +228,44 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [Class] - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; // Operations [Stereotype] - Q_INVOKABLE QObject *containingProfile() const; + Q_TODO Q_INVOKABLE QObject *containingProfile() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstringexpressionobject_p.h b/src/uml/qobjects/qumlstringexpressionobject_p.h index b559c0f3..2787c294 100644 --- a/src/uml/qobjects/qumlstringexpressionobject_p.h +++ b/src/uml/qobjects/qumlstringexpressionobject_p.h @@ -136,28 +136,28 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; // Operations [TemplateableElement] - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [StringExpression] - Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h b/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h index 7fd48d4e..3cc4062b 100644 --- a/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h +++ b/src/uml/qobjects/qumlstructuredactivitynodeobject_p.h @@ -154,7 +154,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -190,19 +190,19 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlsubstitutionobject_p.h b/src/uml/qobjects/qumlsubstitutionobject_p.h index 9af2e61b..69c3dd92 100644 --- a/src/uml/qobjects/qumlsubstitutionobject_p.h +++ b/src/uml/qobjects/qumlsubstitutionobject_p.h @@ -141,13 +141,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltestidentityactionobject_p.h b/src/uml/qobjects/qumltestidentityactionobject_p.h index e01169ba..02a8ceaf 100644 --- a/src/uml/qobjects/qumltestidentityactionobject_p.h +++ b/src/uml/qobjects/qumltestidentityactionobject_p.h @@ -138,7 +138,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -156,13 +156,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltimeconstraintobject_p.h b/src/uml/qobjects/qumltimeconstraintobject_p.h index f734434f..3aa6b181 100644 --- a/src/uml/qobjects/qumltimeconstraintobject_p.h +++ b/src/uml/qobjects/qumltimeconstraintobject_p.h @@ -125,13 +125,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltimeeventobject_p.h b/src/uml/qobjects/qumltimeeventobject_p.h index 230473cd..5f0b1ef4 100644 --- a/src/uml/qobjects/qumltimeeventobject_p.h +++ b/src/uml/qobjects/qumltimeeventobject_p.h @@ -113,13 +113,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltimeexpressionobject_p.h b/src/uml/qobjects/qumltimeexpressionobject_p.h index 198115ca..1865a516 100644 --- a/src/uml/qobjects/qumltimeexpressionobject_p.h +++ b/src/uml/qobjects/qumltimeexpressionobject_p.h @@ -120,22 +120,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltimeintervalobject_p.h b/src/uml/qobjects/qumltimeintervalobject_p.h index 1ecbc461..23660665 100644 --- a/src/uml/qobjects/qumltimeintervalobject_p.h +++ b/src/uml/qobjects/qumltimeintervalobject_p.h @@ -124,22 +124,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [ValueSpecification] - Q_INVOKABLE bool booleanValue() const; - Q_INVOKABLE int integerValue() const; - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isComputable() const; - Q_INVOKABLE bool isNull() const; - Q_INVOKABLE double realValue() const; - Q_INVOKABLE QString stringValue() const; - Q_INVOKABLE QString unlimitedValue() const; + Q_TODO Q_INVOKABLE bool booleanValue() const; + Q_TODO Q_INVOKABLE int integerValue() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isComputable() const; + Q_TODO Q_INVOKABLE bool isNull() const; + Q_TODO Q_INVOKABLE double realValue() const; + Q_TODO Q_INVOKABLE QString stringValue() const; + Q_TODO Q_INVOKABLE QString unlimitedValue() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltimeobservationobject_p.h b/src/uml/qobjects/qumltimeobservationobject_p.h index 6e639ee5..917837fc 100644 --- a/src/uml/qobjects/qumltimeobservationobject_p.h +++ b/src/uml/qobjects/qumltimeobservationobject_p.h @@ -113,13 +113,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltransitionobject_p.h b/src/uml/qobjects/qumltransitionobject_p.h index c5c30cfd..a2b49349 100644 --- a/src/uml/qobjects/qumltransitionobject_p.h +++ b/src/uml/qobjects/qumltransitionobject_p.h @@ -129,7 +129,7 @@ public: Q_INVOKABLE QObject *guard() const; Q_INVOKABLE QtUml::TransitionKind kind() const; Q_INVOKABLE QObject *redefinedTransition() const; - Q_INVOKABLE QObject *redefinitionContext() const; + Q_TODO Q_INVOKABLE QObject *redefinitionContext() const; Q_INVOKABLE QObject *source() const; Q_INVOKABLE QObject *target() const; Q_INVOKABLE const QSet<QObject *> triggers() const; @@ -140,22 +140,22 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [Transition] - Q_INVOKABLE QObject *containingStateMachine() const; - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE QObject *containingStateMachine() const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumltriggerobject_p.h b/src/uml/qobjects/qumltriggerobject_p.h index d57478ff..9c7e5e75 100644 --- a/src/uml/qobjects/qumltriggerobject_p.h +++ b/src/uml/qobjects/qumltriggerobject_p.h @@ -102,8 +102,8 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlunmarshallactionobject_p.h b/src/uml/qobjects/qumlunmarshallactionobject_p.h index cc00c7c1..dc235a33 100644 --- a/src/uml/qobjects/qumlunmarshallactionobject_p.h +++ b/src/uml/qobjects/qumlunmarshallactionobject_p.h @@ -138,7 +138,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -156,13 +156,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlusageobject_p.h b/src/uml/qobjects/qumlusageobject_p.h index e6678e6a..58671f7f 100644 --- a/src/uml/qobjects/qumlusageobject_p.h +++ b/src/uml/qobjects/qumlusageobject_p.h @@ -127,13 +127,13 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlusecaseobject_p.h b/src/uml/qobjects/qumlusecaseobject_p.h index 3d22e9d9..b7b65d81 100644 --- a/src/uml/qobjects/qumlusecaseobject_p.h +++ b/src/uml/qobjects/qumlusecaseobject_p.h @@ -169,9 +169,9 @@ public: Q_INVOKABLE const QSet<QObject *> attributes() const; Q_INVOKABLE const QSet<QObject *> collaborationUses() const; Q_INVOKABLE const QSet<QObject *> features() const; - Q_INVOKABLE const QSet<QObject *> generals() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> generals() const; Q_INVOKABLE const QSet<QObject *> generalizations() const; - Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; + Q_TODO Q_INVOKABLE const QSet<QObject *> inheritedMembers() const; Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE bool isFinalSpecialization() const; Q_INVOKABLE QObject *ownedTemplateSignature() const; @@ -200,42 +200,42 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [Namespace] - Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; - Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; - Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; - Q_INVOKABLE bool membersAreDistinguishable() const; + Q_TODO Q_INVOKABLE QSet<QObject *> excludeCollisions(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE QSet<QString> getNamesOfMember(QObject *element) const; + Q_TODO Q_INVOKABLE QSet<QObject *> importMembers(QSet<QObject *> imps) const; + Q_TODO Q_INVOKABLE bool membersAreDistinguishable() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Type] // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; // Operations [TemplateableElement] - Q_INVOKABLE QSet<QObject *> parameterableElements() const; + Q_TODO Q_INVOKABLE QSet<QObject *> parameterableElements() const; // Operations [Classifier] - Q_INVOKABLE QSet<QObject *> allFeatures() const; - Q_INVOKABLE QSet<QObject *> allParents() const; - Q_INVOKABLE bool conformsTo(QObject *other) const; - Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; - Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; - Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; - Q_INVOKABLE bool isTemplate() const; - Q_INVOKABLE bool maySpecializeType(QObject *c) const; - Q_INVOKABLE QSet<QObject *> parents() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allFeatures() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allParents() const; + Q_TODO Q_INVOKABLE bool conformsTo(QObject *other) const; + Q_TODO Q_INVOKABLE bool hasVisibilityOf(QObject *n) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inherit(QSet<QObject *> inhs) const; + Q_TODO Q_INVOKABLE QSet<QObject *> inheritableMembers(QObject *c) const; + Q_TODO Q_INVOKABLE bool isTemplate() const; + Q_TODO Q_INVOKABLE bool maySpecializeType(QObject *c) const; + Q_TODO Q_INVOKABLE QSet<QObject *> parents() const; // Operations [UseCase] - Q_INVOKABLE QSet<QObject *> allIncludedUseCases() const; + Q_TODO Q_INVOKABLE QSet<QObject *> allIncludedUseCases() const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlvaluepinobject_p.h b/src/uml/qobjects/qumlvaluepinobject_p.h index 4f647dfc..10fb88a8 100644 --- a/src/uml/qobjects/qumlvaluepinobject_p.h +++ b/src/uml/qobjects/qumlvaluepinobject_p.h @@ -122,9 +122,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [NamedElement] @@ -171,23 +171,23 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlvaluespecificationactionobject_p.h b/src/uml/qobjects/qumlvaluespecificationactionobject_p.h index 30ca6278..75593282 100644 --- a/src/uml/qobjects/qumlvaluespecificationactionobject_p.h +++ b/src/uml/qobjects/qumlvaluespecificationactionobject_p.h @@ -137,7 +137,7 @@ public: Q_INVOKABLE const QSet<QObject *> handlers() const; // Owned attributes [Action] - Q_INVOKABLE QObject *context() const; + Q_TODO Q_INVOKABLE QObject *context() const; Q_INVOKABLE const QList<QObject *> inputs() const; Q_INVOKABLE bool isLocallyReentrant() const; Q_INVOKABLE const QSet<QObject *> localPostconditions() const; @@ -154,13 +154,13 @@ public: // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [RedefinableElement] - Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; - Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; + Q_TODO Q_INVOKABLE bool isConsistentWith(QObject *redefinee) const; + Q_TODO Q_INVOKABLE bool isRedefinitionContextValid(QObject *redefined) const; public Q_SLOTS: diff --git a/src/uml/qobjects/qumlvariableobject_p.h b/src/uml/qobjects/qumlvariableobject_p.h index 60b228a8..4aafcf77 100644 --- a/src/uml/qobjects/qumlvariableobject_p.h +++ b/src/uml/qobjects/qumlvariableobject_p.h @@ -105,9 +105,9 @@ public: // Owned attributes [MultiplicityElement] Q_INVOKABLE bool isOrdered() const; Q_INVOKABLE bool isUnique() const; - Q_INVOKABLE int lower() const; + Q_TODO Q_INVOKABLE int lower() const; Q_INVOKABLE QObject *lowerValue() const; - Q_INVOKABLE QString upper() const; + Q_TODO Q_INVOKABLE QString upper() const; Q_INVOKABLE QObject *upperValue() const; // Owned attributes [NamedElement] @@ -125,7 +125,7 @@ public: Q_INVOKABLE QObject *owningTemplateParameter() const; // Owned attributes [ConnectableElement] - Q_INVOKABLE const QList<QObject *> ends() const; + Q_TODO Q_INVOKABLE const QList<QObject *> ends() const; Q_INVOKABLE QObject *templateParameter() const; // Owned attributes [Variable] @@ -137,26 +137,26 @@ public: Q_INVOKABLE bool mustBeOwned() const; // Operations [MultiplicityElement] - Q_INVOKABLE bool compatibleWith(QObject *other) const; - Q_INVOKABLE bool includesCardinality(int C) const; - Q_INVOKABLE bool includesMultiplicity(QObject *M) const; - Q_INVOKABLE bool is(int lowerbound, int upperbound) const; - Q_INVOKABLE bool isMultivalued() const; - Q_INVOKABLE int lowerBound() const; - Q_INVOKABLE QString upperBoundOperation() const; + Q_TODO Q_INVOKABLE bool compatibleWith(QObject *other) const; + Q_TODO Q_INVOKABLE bool includesCardinality(int C) const; + Q_TODO Q_INVOKABLE bool includesMultiplicity(QObject *M) const; + Q_TODO Q_INVOKABLE bool is(int lowerbound, int upperbound) const; + Q_TODO Q_INVOKABLE bool isMultivalued() const; + Q_TODO Q_INVOKABLE int lowerBound() const; + Q_TODO Q_INVOKABLE QString upperBoundOperation() const; // Operations [NamedElement] Q_INVOKABLE QList<QObject *> allNamespaces() const; - Q_INVOKABLE QSet<QObject *> allOwningPackages() const; - Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; + Q_TODO Q_INVOKABLE QSet<QObject *> allOwningPackages() const; + Q_TODO Q_INVOKABLE bool isDistinguishableFrom(QObject *n, QObject *ns) const; Q_INVOKABLE QString separator() const; // Operations [ParameterableElement] - Q_INVOKABLE bool isCompatibleWith(QObject *p) const; - Q_INVOKABLE bool isTemplateParameter() const; + Q_TODO Q_INVOKABLE bool isCompatibleWith(QObject *p) const; + Q_TODO Q_INVOKABLE bool isTemplateParameter() const; // Operations [Variable] - Q_INVOKABLE bool isAccessibleBy(QObject *a) const; + Q_TODO Q_INVOKABLE bool isAccessibleBy(QObject *a) const; public Q_SLOTS: diff --git a/src/uml/qumlabstraction.cpp b/src/uml/qumlabstraction.cpp index 18c5297f..c9e6fc83 100644 --- a/src/uml/qumlabstraction.cpp +++ b/src/uml/qumlabstraction.cpp @@ -74,6 +74,14 @@ QUmlAbstraction::QUmlAbstraction(bool createQModelingObject) : } /*! + Destroys the QUmlAbstraction. + */ +QUmlAbstraction::~QUmlAbstraction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAbstraction. */ QModelingElement *QUmlAbstraction::clone() const @@ -81,20 +89,10 @@ QModelingElement *QUmlAbstraction::clone() const QUmlAbstraction *c = new QUmlAbstraction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); if (mapping()) c->setMapping(dynamic_cast<QUmlOpaqueExpression *>(mapping()->clone())); return c; diff --git a/src/uml/qumlabstraction.h b/src/uml/qumlabstraction.h index 8911c817..55ff4743 100644 --- a/src/uml/qumlabstraction.h +++ b/src/uml/qumlabstraction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlAbstraction : public QUmlDependency { public: explicit QUmlAbstraction(bool createQModelingObject = true); + virtual ~QUmlAbstraction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlacceptcallaction.cpp b/src/uml/qumlacceptcallaction.cpp index e4632757..25b0c58f 100644 --- a/src/uml/qumlacceptcallaction.cpp +++ b/src/uml/qumlacceptcallaction.cpp @@ -86,6 +86,14 @@ QUmlAcceptCallAction::QUmlAcceptCallAction(bool createQModelingObject) : } /*! + Destroys the QUmlAcceptCallAction. + */ +QUmlAcceptCallAction::~QUmlAcceptCallAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAcceptCallAction. */ QModelingElement *QUmlAcceptCallAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlAcceptCallAction::clone() const QUmlAcceptCallAction *c = new QUmlAcceptCallAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlacceptcallaction.h b/src/uml/qumlacceptcallaction.h index 27013a7b..bcbfc536 100644 --- a/src/uml/qumlacceptcallaction.h +++ b/src/uml/qumlacceptcallaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlAcceptCallAction : public QUmlAcceptEventAction { public: explicit QUmlAcceptCallAction(bool createQModelingObject = true); + virtual ~QUmlAcceptCallAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlaccepteventaction.cpp b/src/uml/qumlaccepteventaction.cpp index 038ec19e..956d5f43 100644 --- a/src/uml/qumlaccepteventaction.cpp +++ b/src/uml/qumlaccepteventaction.cpp @@ -85,6 +85,14 @@ QUmlAcceptEventAction::QUmlAcceptEventAction(bool createQModelingObject) : } /*! + Destroys the QUmlAcceptEventAction. + */ +QUmlAcceptEventAction::~QUmlAcceptEventAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAcceptEventAction. */ QModelingElement *QUmlAcceptEventAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlAcceptEventAction::clone() const QUmlAcceptEventAction *c = new QUmlAcceptEventAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlaccepteventaction.h b/src/uml/qumlaccepteventaction.h index 3ef589ff..e4a13374 100644 --- a/src/uml/qumlaccepteventaction.h +++ b/src/uml/qumlaccepteventaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlAcceptEventAction : public QUmlAction { public: explicit QUmlAcceptEventAction(bool createQModelingObject = true); + virtual ~QUmlAcceptEventAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlaction.cpp b/src/uml/qumlaction.cpp index a7c725d1..164e5bbe 100644 --- a/src/uml/qumlaction.cpp +++ b/src/uml/qumlaction.cpp @@ -82,6 +82,14 @@ QUmlAction::QUmlAction() : } /*! + Destroys the QUmlAction. + */ +QUmlAction::~QUmlAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAction. */ QModelingElement *QUmlAction::clone() const @@ -89,27 +97,11 @@ QModelingElement *QUmlAction::clone() const QUmlAction *c = new QUmlAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlaction.h b/src/uml/qumlaction.h index 93b6375b..42d1ed21 100644 --- a/src/uml/qumlaction.h +++ b/src/uml/qumlaction.h @@ -57,6 +57,8 @@ class QUmlOutputPin; class Q_UML_EXPORT QUmlAction : public QUmlExecutableNode { public: + virtual ~QUmlAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactionexecutionspecification.cpp b/src/uml/qumlactionexecutionspecification.cpp index 83245057..66ccbc07 100644 --- a/src/uml/qumlactionexecutionspecification.cpp +++ b/src/uml/qumlactionexecutionspecification.cpp @@ -77,6 +77,14 @@ QUmlActionExecutionSpecification::QUmlActionExecutionSpecification(bool createQM } /*! + Destroys the QUmlActionExecutionSpecification. + */ +QUmlActionExecutionSpecification::~QUmlActionExecutionSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActionExecutionSpecification. */ QModelingElement *QUmlActionExecutionSpecification::clone() const @@ -84,26 +92,12 @@ QModelingElement *QUmlActionExecutionSpecification::clone() const QUmlActionExecutionSpecification *c = new QUmlActionExecutionSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (finish()) - c->setFinish(dynamic_cast<QUmlOccurrenceSpecification *>(finish()->clone())); - if (start()) - c->setStart(dynamic_cast<QUmlOccurrenceSpecification *>(start()->clone())); - if (action()) - c->setAction(dynamic_cast<QUmlAction *>(action()->clone())); return c; } diff --git a/src/uml/qumlactionexecutionspecification.h b/src/uml/qumlactionexecutionspecification.h index 60d344a6..949936ba 100644 --- a/src/uml/qumlactionexecutionspecification.h +++ b/src/uml/qumlactionexecutionspecification.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlActionExecutionSpecification : public QUmlExecutionSpecif { public: explicit QUmlActionExecutionSpecification(bool createQModelingObject = true); + virtual ~QUmlActionExecutionSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlactioninputpin.cpp b/src/uml/qumlactioninputpin.cpp index da1d0f51..30267b39 100644 --- a/src/uml/qumlactioninputpin.cpp +++ b/src/uml/qumlactioninputpin.cpp @@ -87,6 +87,14 @@ QUmlActionInputPin::QUmlActionInputPin(bool createQModelingObject) : } /*! + Destroys the QUmlActionInputPin. + */ +QUmlActionInputPin::~QUmlActionInputPin() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActionInputPin. */ QModelingElement *QUmlActionInputPin::clone() const @@ -100,35 +108,13 @@ QModelingElement *QUmlActionInputPin::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); c->setControl(isControl()); diff --git a/src/uml/qumlactioninputpin.h b/src/uml/qumlactioninputpin.h index 1264a1c5..c60b8637 100644 --- a/src/uml/qumlactioninputpin.h +++ b/src/uml/qumlactioninputpin.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlActionInputPin : public QUmlInputPin { public: explicit QUmlActionInputPin(bool createQModelingObject = true); + virtual ~QUmlActionInputPin(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlactivity.cpp b/src/uml/qumlactivity.cpp index a016fdc8..ce8d3241 100644 --- a/src/uml/qumlactivity.cpp +++ b/src/uml/qumlactivity.cpp @@ -110,6 +110,14 @@ QUmlActivity::QUmlActivity(bool createQModelingObject) : } /*! + Destroys the QUmlActivity. + */ +QUmlActivity::~QUmlActivity() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActivity. */ QModelingElement *QUmlActivity::clone() const @@ -117,8 +125,6 @@ QModelingElement *QUmlActivity::clone() const QUmlActivity *c = new QUmlActivity; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -128,11 +134,7 @@ QModelingElement *QUmlActivity::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -145,22 +147,10 @@ QModelingElement *QUmlActivity::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -184,10 +174,6 @@ QModelingElement *QUmlActivity::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - foreach (QUmlBehavior *element, redefinedBehaviors()) - c->addRedefinedBehavior(dynamic_cast<QUmlBehavior *>(element->clone())); - if (specification()) - c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone())); foreach (QUmlActivityEdge *element, edges()) c->addEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); foreach (QUmlActivityGroup *element, groups()) @@ -196,8 +182,6 @@ QModelingElement *QUmlActivity::clone() const c->setSingleExecution(isSingleExecution()); foreach (QUmlActivityNode *element, nodes()) c->addNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - foreach (QUmlActivityPartition *element, partitions()) - c->addPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); foreach (QUmlStructuredActivityNode *element, structuredNodes()) c->addStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(element->clone())); foreach (QUmlVariable *element, variables()) diff --git a/src/uml/qumlactivity.h b/src/uml/qumlactivity.h index 3a8ebc4a..5f2ed142 100644 --- a/src/uml/qumlactivity.h +++ b/src/uml/qumlactivity.h @@ -60,6 +60,7 @@ class Q_UML_EXPORT QUmlActivity : public QUmlBehavior { public: explicit QUmlActivity(bool createQModelingObject = true); + virtual ~QUmlActivity(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlactivityedge.cpp b/src/uml/qumlactivityedge.cpp index 1ae5520e..f5cce48d 100644 --- a/src/uml/qumlactivityedge.cpp +++ b/src/uml/qumlactivityedge.cpp @@ -83,6 +83,14 @@ QUmlActivityEdge::QUmlActivityEdge() : } /*! + Destroys the QUmlActivityEdge. + */ +QUmlActivityEdge::~QUmlActivityEdge() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActivityEdge. */ QModelingElement *QUmlActivityEdge::clone() const @@ -90,29 +98,13 @@ QModelingElement *QUmlActivityEdge::clone() const QUmlActivityEdge *c = new QUmlActivityEdge; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); if (guard()) c->setGuard(dynamic_cast<QUmlValueSpecification *>(guard()->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - if (interrupts()) - c->setInterrupts(dynamic_cast<QUmlInterruptibleActivityRegion *>(interrupts()->clone())); - foreach (QUmlActivityEdge *element, redefinedEdges()) - c->addRedefinedEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); - if (source()) - c->setSource(dynamic_cast<QUmlActivityNode *>(source()->clone())); - if (target()) - c->setTarget(dynamic_cast<QUmlActivityNode *>(target()->clone())); if (weight()) c->setWeight(dynamic_cast<QUmlValueSpecification *>(weight()->clone())); return c; diff --git a/src/uml/qumlactivityedge.h b/src/uml/qumlactivityedge.h index 89989b44..5da92761 100644 --- a/src/uml/qumlactivityedge.h +++ b/src/uml/qumlactivityedge.h @@ -60,6 +60,8 @@ class QUmlValueSpecification; class Q_UML_EXPORT QUmlActivityEdge : public QUmlRedefinableElement { public: + virtual ~QUmlActivityEdge(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactivityfinalnode.cpp b/src/uml/qumlactivityfinalnode.cpp index d97915d6..2c1c0ca0 100644 --- a/src/uml/qumlactivityfinalnode.cpp +++ b/src/uml/qumlactivityfinalnode.cpp @@ -79,6 +79,14 @@ QUmlActivityFinalNode::QUmlActivityFinalNode(bool createQModelingObject) } /*! + Destroys the QUmlActivityFinalNode. + */ +QUmlActivityFinalNode::~QUmlActivityFinalNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActivityFinalNode. */ QModelingElement *QUmlActivityFinalNode::clone() const @@ -86,27 +94,11 @@ QModelingElement *QUmlActivityFinalNode::clone() const QUmlActivityFinalNode *c = new QUmlActivityFinalNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlactivityfinalnode.h b/src/uml/qumlactivityfinalnode.h index 0a46e7af..2f0fe0e0 100644 --- a/src/uml/qumlactivityfinalnode.h +++ b/src/uml/qumlactivityfinalnode.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlActivityFinalNode : public QUmlFinalNode { public: explicit QUmlActivityFinalNode(bool createQModelingObject = true); + virtual ~QUmlActivityFinalNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlactivitygroup.cpp b/src/uml/qumlactivitygroup.cpp index f59da474..7503f0fe 100644 --- a/src/uml/qumlactivitygroup.cpp +++ b/src/uml/qumlactivitygroup.cpp @@ -72,6 +72,14 @@ QUmlActivityGroup::QUmlActivityGroup() : } /*! + Destroys the QUmlActivityGroup. + */ +QUmlActivityGroup::~QUmlActivityGroup() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActivityGroup. */ QModelingElement *QUmlActivityGroup::clone() const @@ -79,14 +87,10 @@ QModelingElement *QUmlActivityGroup::clone() const QUmlActivityGroup *c = new QUmlActivityGroup; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (inActivity()) - c->setInActivity(dynamic_cast<QUmlActivity *>(inActivity()->clone())); return c; } diff --git a/src/uml/qumlactivitygroup.h b/src/uml/qumlactivitygroup.h index 01440943..e430b86a 100644 --- a/src/uml/qumlactivitygroup.h +++ b/src/uml/qumlactivitygroup.h @@ -56,6 +56,8 @@ class QUmlActivityNode; class Q_UML_EXPORT QUmlActivityGroup : public virtual QUmlNamedElement { public: + virtual ~QUmlActivityGroup(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactivitynode.cpp b/src/uml/qumlactivitynode.cpp index cde25139..4dfcac72 100644 --- a/src/uml/qumlactivitynode.cpp +++ b/src/uml/qumlactivitynode.cpp @@ -77,6 +77,14 @@ QUmlActivityNode::QUmlActivityNode() : } /*! + Destroys the QUmlActivityNode. + */ +QUmlActivityNode::~QUmlActivityNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActivityNode. */ QModelingElement *QUmlActivityNode::clone() const @@ -84,27 +92,11 @@ QModelingElement *QUmlActivityNode::clone() const QUmlActivityNode *c = new QUmlActivityNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlactivitynode.h b/src/uml/qumlactivitynode.h index 007787f6..464cbcde 100644 --- a/src/uml/qumlactivitynode.h +++ b/src/uml/qumlactivitynode.h @@ -59,6 +59,8 @@ class QUmlStructuredActivityNode; class Q_UML_EXPORT QUmlActivityNode : public QUmlRedefinableElement { public: + virtual ~QUmlActivityNode(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactivityparameternode.cpp b/src/uml/qumlactivityparameternode.cpp index 96958c66..07f30a0b 100644 --- a/src/uml/qumlactivityparameternode.cpp +++ b/src/uml/qumlactivityparameternode.cpp @@ -85,6 +85,14 @@ QUmlActivityParameterNode::QUmlActivityParameterNode(bool createQModelingObject) } /*! + Destroys the QUmlActivityParameterNode. + */ +QUmlActivityParameterNode::~QUmlActivityParameterNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActivityParameterNode. */ QModelingElement *QUmlActivityParameterNode::clone() const @@ -92,39 +100,15 @@ QModelingElement *QUmlActivityParameterNode::clone() const QUmlActivityParameterNode *c = new QUmlActivityParameterNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); - if (parameter()) - c->setParameter(dynamic_cast<QUmlParameter *>(parameter()->clone())); return c; } diff --git a/src/uml/qumlactivityparameternode.h b/src/uml/qumlactivityparameternode.h index a0457c65..7f6c66f1 100644 --- a/src/uml/qumlactivityparameternode.h +++ b/src/uml/qumlactivityparameternode.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlActivityParameterNode : public QUmlObjectNode { public: explicit QUmlActivityParameterNode(bool createQModelingObject = true); + virtual ~QUmlActivityParameterNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlactivitypartition.cpp b/src/uml/qumlactivitypartition.cpp index bb5fb307..bb956095 100644 --- a/src/uml/qumlactivitypartition.cpp +++ b/src/uml/qumlactivitypartition.cpp @@ -77,6 +77,14 @@ QUmlActivityPartition::QUmlActivityPartition(bool createQModelingObject) : } /*! + Destroys the QUmlActivityPartition. + */ +QUmlActivityPartition::~QUmlActivityPartition() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActivityPartition. */ QModelingElement *QUmlActivityPartition::clone() const @@ -84,26 +92,14 @@ QModelingElement *QUmlActivityPartition::clone() const QUmlActivityPartition *c = new QUmlActivityPartition; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (inActivity()) - c->setInActivity(dynamic_cast<QUmlActivity *>(inActivity()->clone())); - foreach (QUmlActivityEdge *element, edges()) - c->addEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); c->setDimension(isDimension()); c->setExternal(isExternal()); - foreach (QUmlActivityNode *element, nodes()) - c->addNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (represents()) - c->setRepresents(dynamic_cast<QUmlElement *>(represents()->clone())); foreach (QUmlActivityPartition *element, subpartitions()) c->addSubpartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (superPartition()) - c->setSuperPartition(dynamic_cast<QUmlActivityPartition *>(superPartition()->clone())); return c; } diff --git a/src/uml/qumlactivitypartition.h b/src/uml/qumlactivitypartition.h index f4a348d3..b932d15d 100644 --- a/src/uml/qumlactivitypartition.h +++ b/src/uml/qumlactivitypartition.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlActivityPartition : public QUmlActivityGroup { public: explicit QUmlActivityPartition(bool createQModelingObject = true); + virtual ~QUmlActivityPartition(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlactor.cpp b/src/uml/qumlactor.cpp index bc95d9ac..6432481d 100644 --- a/src/uml/qumlactor.cpp +++ b/src/uml/qumlactor.cpp @@ -92,6 +92,14 @@ QUmlActor::QUmlActor(bool createQModelingObject) } /*! + Destroys the QUmlActor. + */ +QUmlActor::~QUmlActor() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlActor. */ QModelingElement *QUmlActor::clone() const @@ -99,8 +107,6 @@ QModelingElement *QUmlActor::clone() const QUmlActor *c = new QUmlActor; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -110,11 +116,7 @@ QModelingElement *QUmlActor::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -128,20 +130,8 @@ QModelingElement *QUmlActor::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumlactor.h b/src/uml/qumlactor.h index 0052d428..46f79562 100644 --- a/src/uml/qumlactor.h +++ b/src/uml/qumlactor.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlActor : public QUmlBehavioredClassifier { public: explicit QUmlActor(bool createQModelingObject = true); + virtual ~QUmlActor(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumladdstructuralfeaturevalueaction.cpp b/src/uml/qumladdstructuralfeaturevalueaction.cpp index d1ef77fb..0e711858 100644 --- a/src/uml/qumladdstructuralfeaturevalueaction.cpp +++ b/src/uml/qumladdstructuralfeaturevalueaction.cpp @@ -86,6 +86,14 @@ QUmlAddStructuralFeatureValueAction::QUmlAddStructuralFeatureValueAction(bool cr } /*! + Destroys the QUmlAddStructuralFeatureValueAction. + */ +QUmlAddStructuralFeatureValueAction::~QUmlAddStructuralFeatureValueAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAddStructuralFeatureValueAction. */ QModelingElement *QUmlAddStructuralFeatureValueAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlAddStructuralFeatureValueAction::clone() const QUmlAddStructuralFeatureValueAction *c = new QUmlAddStructuralFeatureValueAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -123,8 +115,6 @@ QModelingElement *QUmlAddStructuralFeatureValueAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - if (structuralFeature()) - c->setStructuralFeature(dynamic_cast<QUmlStructuralFeature *>(structuralFeature()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); if (value()) diff --git a/src/uml/qumladdstructuralfeaturevalueaction.h b/src/uml/qumladdstructuralfeaturevalueaction.h index fca95f09..aae3fabe 100644 --- a/src/uml/qumladdstructuralfeaturevalueaction.h +++ b/src/uml/qumladdstructuralfeaturevalueaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlAddStructuralFeatureValueAction : public QUmlWriteStructu { public: explicit QUmlAddStructuralFeatureValueAction(bool createQModelingObject = true); + virtual ~QUmlAddStructuralFeatureValueAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumladdvariablevalueaction.cpp b/src/uml/qumladdvariablevalueaction.cpp index cb3848de..c3003312 100644 --- a/src/uml/qumladdvariablevalueaction.cpp +++ b/src/uml/qumladdvariablevalueaction.cpp @@ -86,6 +86,14 @@ QUmlAddVariableValueAction::QUmlAddVariableValueAction(bool createQModelingObjec } /*! + Destroys the QUmlAddVariableValueAction. + */ +QUmlAddVariableValueAction::~QUmlAddVariableValueAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAddVariableValueAction. */ QModelingElement *QUmlAddVariableValueAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlAddVariableValueAction::clone() const QUmlAddVariableValueAction *c = new QUmlAddVariableValueAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,8 +113,6 @@ QModelingElement *QUmlAddVariableValueAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (variable()) - c->setVariable(dynamic_cast<QUmlVariable *>(variable()->clone())); if (value()) c->setValue(dynamic_cast<QUmlInputPin *>(value()->clone())); if (insertAt()) diff --git a/src/uml/qumladdvariablevalueaction.h b/src/uml/qumladdvariablevalueaction.h index 20148b58..610e9aa7 100644 --- a/src/uml/qumladdvariablevalueaction.h +++ b/src/uml/qumladdvariablevalueaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlAddVariableValueAction : public QUmlWriteVariableAction { public: explicit QUmlAddVariableValueAction(bool createQModelingObject = true); + virtual ~QUmlAddVariableValueAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlanyreceiveevent.cpp b/src/uml/qumlanyreceiveevent.cpp index 5f3ffa7d..548b23b6 100644 --- a/src/uml/qumlanyreceiveevent.cpp +++ b/src/uml/qumlanyreceiveevent.cpp @@ -72,6 +72,14 @@ QUmlAnyReceiveEvent::QUmlAnyReceiveEvent(bool createQModelingObject) } /*! + Destroys the QUmlAnyReceiveEvent. + */ +QUmlAnyReceiveEvent::~QUmlAnyReceiveEvent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAnyReceiveEvent. */ QModelingElement *QUmlAnyReceiveEvent::clone() const @@ -79,12 +87,6 @@ QModelingElement *QUmlAnyReceiveEvent::clone() const QUmlAnyReceiveEvent *c = new QUmlAnyReceiveEvent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlanyreceiveevent.h b/src/uml/qumlanyreceiveevent.h index 9fe874d7..fe40286c 100644 --- a/src/uml/qumlanyreceiveevent.h +++ b/src/uml/qumlanyreceiveevent.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlAnyReceiveEvent : public QUmlMessageEvent { public: explicit QUmlAnyReceiveEvent(bool createQModelingObject = true); + virtual ~QUmlAnyReceiveEvent(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlartifact.cpp b/src/uml/qumlartifact.cpp index 8fd989d7..e254be70 100644 --- a/src/uml/qumlartifact.cpp +++ b/src/uml/qumlartifact.cpp @@ -91,6 +91,14 @@ QUmlArtifact::QUmlArtifact(bool createQModelingObject) } /*! + Destroys the QUmlArtifact. + */ +QUmlArtifact::~QUmlArtifact() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlArtifact. */ QModelingElement *QUmlArtifact::clone() const @@ -98,8 +106,6 @@ QModelingElement *QUmlArtifact::clone() const QUmlArtifact *c = new QUmlArtifact; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -109,11 +115,7 @@ QModelingElement *QUmlArtifact::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -127,18 +129,8 @@ QModelingElement *QUmlArtifact::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); c->setFileName(fileName()); foreach (QUmlManifestation *element, manifestations()) c->addManifestation(dynamic_cast<QUmlManifestation *>(element->clone())); diff --git a/src/uml/qumlartifact.h b/src/uml/qumlartifact.h index e7222fe1..d5b97938 100644 --- a/src/uml/qumlartifact.h +++ b/src/uml/qumlartifact.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlArtifact : public QUmlDeployedArtifact, public QUmlClassi { public: explicit QUmlArtifact(bool createQModelingObject = true); + virtual ~QUmlArtifact(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlassociation.cpp b/src/uml/qumlassociation.cpp index 20208070..f972209c 100644 --- a/src/uml/qumlassociation.cpp +++ b/src/uml/qumlassociation.cpp @@ -90,6 +90,14 @@ QUmlAssociation::QUmlAssociation(bool createQModelingObject) : } /*! + Destroys the QUmlAssociation. + */ +QUmlAssociation::~QUmlAssociation() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAssociation. */ QModelingElement *QUmlAssociation::clone() const @@ -97,8 +105,6 @@ QModelingElement *QUmlAssociation::clone() const QUmlAssociation *c = new QUmlAssociation; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -108,11 +114,7 @@ QModelingElement *QUmlAssociation::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -126,23 +128,9 @@ QModelingElement *QUmlAssociation::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); c->setDerived(isDerived()); - foreach (QUmlProperty *element, memberEnds()) - c->addMemberEnd(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, navigableOwnedEnds()) - c->addNavigableOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlProperty *element, ownedEnds()) c->addOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone())); return c; diff --git a/src/uml/qumlassociation.h b/src/uml/qumlassociation.h index ba226142..d60a5241 100644 --- a/src/uml/qumlassociation.h +++ b/src/uml/qumlassociation.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlAssociation : public virtual QUmlClassifier, public QUmlR { public: explicit QUmlAssociation(bool createQModelingObject = true); + virtual ~QUmlAssociation(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlassociationclass.cpp b/src/uml/qumlassociationclass.cpp index 333a8f7c..f76d8be3 100644 --- a/src/uml/qumlassociationclass.cpp +++ b/src/uml/qumlassociationclass.cpp @@ -100,6 +100,14 @@ QUmlAssociationClass::QUmlAssociationClass(bool createQModelingObject) : } /*! + Destroys the QUmlAssociationClass. + */ +QUmlAssociationClass::~QUmlAssociationClass() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlAssociationClass. */ QModelingElement *QUmlAssociationClass::clone() const @@ -107,8 +115,6 @@ QModelingElement *QUmlAssociationClass::clone() const QUmlAssociationClass *c = new QUmlAssociationClass; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -118,11 +124,7 @@ QModelingElement *QUmlAssociationClass::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -135,22 +137,10 @@ QModelingElement *QUmlAssociationClass::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -166,10 +156,6 @@ QModelingElement *QUmlAssociationClass::clone() const foreach (QUmlReception *element, ownedReceptions()) c->addOwnedReception(dynamic_cast<QUmlReception *>(element->clone())); c->setDerived(isDerived()); - foreach (QUmlProperty *element, memberEnds()) - c->addMemberEnd(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, navigableOwnedEnds()) - c->addNavigableOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlProperty *element, ownedEnds()) c->addOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone())); return c; diff --git a/src/uml/qumlassociationclass.h b/src/uml/qumlassociationclass.h index b72aacf8..f7338ead 100644 --- a/src/uml/qumlassociationclass.h +++ b/src/uml/qumlassociationclass.h @@ -54,6 +54,7 @@ class Q_UML_EXPORT QUmlAssociationClass : public QUmlClass, public QUmlAssociati { public: explicit QUmlAssociationClass(bool createQModelingObject = true); + virtual ~QUmlAssociationClass(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlbehavior.cpp b/src/uml/qumlbehavior.cpp index 0a70e029..d8322252 100644 --- a/src/uml/qumlbehavior.cpp +++ b/src/uml/qumlbehavior.cpp @@ -102,6 +102,14 @@ QUmlBehavior::QUmlBehavior() : } /*! + Destroys the QUmlBehavior. + */ +QUmlBehavior::~QUmlBehavior() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlBehavior. */ QModelingElement *QUmlBehavior::clone() const @@ -109,8 +117,6 @@ QModelingElement *QUmlBehavior::clone() const QUmlBehavior *c = new QUmlBehavior; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -120,11 +126,7 @@ QModelingElement *QUmlBehavior::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -137,22 +139,10 @@ QModelingElement *QUmlBehavior::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -176,10 +166,6 @@ QModelingElement *QUmlBehavior::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - foreach (QUmlBehavior *element, redefinedBehaviors()) - c->addRedefinedBehavior(dynamic_cast<QUmlBehavior *>(element->clone())); - if (specification()) - c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone())); return c; } diff --git a/src/uml/qumlbehavior.h b/src/uml/qumlbehavior.h index 7133a2ee..6d613f3f 100644 --- a/src/uml/qumlbehavior.h +++ b/src/uml/qumlbehavior.h @@ -58,6 +58,8 @@ class QUmlParameterSet; class Q_UML_EXPORT QUmlBehavior : public QUmlClass { public: + virtual ~QUmlBehavior(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlbehavioralfeature.cpp b/src/uml/qumlbehavioralfeature.cpp index 41802ddb..55e7a816 100644 --- a/src/uml/qumlbehavioralfeature.cpp +++ b/src/uml/qumlbehavioralfeature.cpp @@ -79,6 +79,14 @@ QUmlBehavioralFeature::QUmlBehavioralFeature() : } /*! + Destroys the QUmlBehavioralFeature. + */ +QUmlBehavioralFeature::~QUmlBehavioralFeature() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlBehavioralFeature. */ QModelingElement *QUmlBehavioralFeature::clone() const @@ -86,8 +94,6 @@ QModelingElement *QUmlBehavioralFeature::clone() const QUmlBehavioralFeature *c = new QUmlBehavioralFeature; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -102,14 +108,10 @@ QModelingElement *QUmlBehavioralFeature::clone() const c->setStatic(isStatic()); c->setConcurrency(concurrency()); c->setAbstract(isAbstract()); - foreach (QUmlBehavior *element, methods()) - c->addMethod(dynamic_cast<QUmlBehavior *>(element->clone())); foreach (QUmlParameter *element, ownedParameters()) c->addOwnedParameter(dynamic_cast<QUmlParameter *>(element->clone())); foreach (QUmlParameterSet *element, ownedParameterSets()) c->addOwnedParameterSet(dynamic_cast<QUmlParameterSet *>(element->clone())); - foreach (QUmlType *element, raisedExceptions()) - c->addRaisedException(dynamic_cast<QUmlType *>(element->clone())); return c; } diff --git a/src/uml/qumlbehavioralfeature.h b/src/uml/qumlbehavioralfeature.h index ca53bd3b..23d37da0 100644 --- a/src/uml/qumlbehavioralfeature.h +++ b/src/uml/qumlbehavioralfeature.h @@ -61,6 +61,8 @@ class QUmlType; class Q_UML_EXPORT QUmlBehavioralFeature : public QUmlNamespace, public QUmlFeature { public: + virtual ~QUmlBehavioralFeature(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlbehavioredclassifier.cpp b/src/uml/qumlbehavioredclassifier.cpp index 409a53f0..fa926e65 100644 --- a/src/uml/qumlbehavioredclassifier.cpp +++ b/src/uml/qumlbehavioredclassifier.cpp @@ -90,6 +90,14 @@ QUmlBehavioredClassifier::QUmlBehavioredClassifier() : } /*! + Destroys the QUmlBehavioredClassifier. + */ +QUmlBehavioredClassifier::~QUmlBehavioredClassifier() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlBehavioredClassifier. */ QModelingElement *QUmlBehavioredClassifier::clone() const @@ -97,8 +105,6 @@ QModelingElement *QUmlBehavioredClassifier::clone() const QUmlBehavioredClassifier *c = new QUmlBehavioredClassifier; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -108,11 +114,7 @@ QModelingElement *QUmlBehavioredClassifier::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -126,20 +128,8 @@ QModelingElement *QUmlBehavioredClassifier::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumlbehavioredclassifier.h b/src/uml/qumlbehavioredclassifier.h index 7eede10a..8d585ed0 100644 --- a/src/uml/qumlbehavioredclassifier.h +++ b/src/uml/qumlbehavioredclassifier.h @@ -55,6 +55,8 @@ class QUmlInterfaceRealization; class Q_UML_EXPORT QUmlBehavioredClassifier : public virtual QUmlClassifier { public: + virtual ~QUmlBehavioredClassifier(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlbehaviorexecutionspecification.cpp b/src/uml/qumlbehaviorexecutionspecification.cpp index 282c3745..f2c38b95 100644 --- a/src/uml/qumlbehaviorexecutionspecification.cpp +++ b/src/uml/qumlbehaviorexecutionspecification.cpp @@ -77,6 +77,14 @@ QUmlBehaviorExecutionSpecification::QUmlBehaviorExecutionSpecification(bool crea } /*! + Destroys the QUmlBehaviorExecutionSpecification. + */ +QUmlBehaviorExecutionSpecification::~QUmlBehaviorExecutionSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlBehaviorExecutionSpecification. */ QModelingElement *QUmlBehaviorExecutionSpecification::clone() const @@ -84,26 +92,12 @@ QModelingElement *QUmlBehaviorExecutionSpecification::clone() const QUmlBehaviorExecutionSpecification *c = new QUmlBehaviorExecutionSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (finish()) - c->setFinish(dynamic_cast<QUmlOccurrenceSpecification *>(finish()->clone())); - if (start()) - c->setStart(dynamic_cast<QUmlOccurrenceSpecification *>(start()->clone())); - if (behavior()) - c->setBehavior(dynamic_cast<QUmlBehavior *>(behavior()->clone())); return c; } diff --git a/src/uml/qumlbehaviorexecutionspecification.h b/src/uml/qumlbehaviorexecutionspecification.h index 56fc1347..8899a273 100644 --- a/src/uml/qumlbehaviorexecutionspecification.h +++ b/src/uml/qumlbehaviorexecutionspecification.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlBehaviorExecutionSpecification : public QUmlExecutionSpec { public: explicit QUmlBehaviorExecutionSpecification(bool createQModelingObject = true); + virtual ~QUmlBehaviorExecutionSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlbroadcastsignalaction.cpp b/src/uml/qumlbroadcastsignalaction.cpp index 375bcbe4..1aeed26c 100644 --- a/src/uml/qumlbroadcastsignalaction.cpp +++ b/src/uml/qumlbroadcastsignalaction.cpp @@ -86,6 +86,14 @@ QUmlBroadcastSignalAction::QUmlBroadcastSignalAction(bool createQModelingObject) } /*! + Destroys the QUmlBroadcastSignalAction. + */ +QUmlBroadcastSignalAction::~QUmlBroadcastSignalAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlBroadcastSignalAction. */ QModelingElement *QUmlBroadcastSignalAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlBroadcastSignalAction::clone() const QUmlBroadcastSignalAction *c = new QUmlBroadcastSignalAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -123,10 +115,6 @@ QModelingElement *QUmlBroadcastSignalAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlInputPin *element, arguments()) c->addArgument(dynamic_cast<QUmlInputPin *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); - if (signal()) - c->setSignal(dynamic_cast<QUmlSignal *>(signal()->clone())); return c; } diff --git a/src/uml/qumlbroadcastsignalaction.h b/src/uml/qumlbroadcastsignalaction.h index 1b4dc623..e2a0c7fa 100644 --- a/src/uml/qumlbroadcastsignalaction.h +++ b/src/uml/qumlbroadcastsignalaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlBroadcastSignalAction : public QUmlInvocationAction { public: explicit QUmlBroadcastSignalAction(bool createQModelingObject = true); + virtual ~QUmlBroadcastSignalAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcallaction.cpp b/src/uml/qumlcallaction.cpp index 38ed2c22..7b838035 100644 --- a/src/uml/qumlcallaction.cpp +++ b/src/uml/qumlcallaction.cpp @@ -83,6 +83,14 @@ QUmlCallAction::QUmlCallAction() : } /*! + Destroys the QUmlCallAction. + */ +QUmlCallAction::~QUmlCallAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCallAction. */ QModelingElement *QUmlCallAction::clone() const @@ -90,27 +98,11 @@ QModelingElement *QUmlCallAction::clone() const QUmlCallAction *c = new QUmlCallAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -120,8 +112,6 @@ QModelingElement *QUmlCallAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlInputPin *element, arguments()) c->addArgument(dynamic_cast<QUmlInputPin *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); c->setSynchronous(isSynchronous()); foreach (QUmlOutputPin *element, results()) c->addResult(dynamic_cast<QUmlOutputPin *>(element->clone())); diff --git a/src/uml/qumlcallaction.h b/src/uml/qumlcallaction.h index 8307b490..35093779 100644 --- a/src/uml/qumlcallaction.h +++ b/src/uml/qumlcallaction.h @@ -54,6 +54,8 @@ class QUmlOutputPin; class Q_UML_EXPORT QUmlCallAction : public QUmlInvocationAction { public: + virtual ~QUmlCallAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlcallbehavioraction.cpp b/src/uml/qumlcallbehavioraction.cpp index 264856d4..9294a980 100644 --- a/src/uml/qumlcallbehavioraction.cpp +++ b/src/uml/qumlcallbehavioraction.cpp @@ -86,6 +86,14 @@ QUmlCallBehaviorAction::QUmlCallBehaviorAction(bool createQModelingObject) : } /*! + Destroys the QUmlCallBehaviorAction. + */ +QUmlCallBehaviorAction::~QUmlCallBehaviorAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCallBehaviorAction. */ QModelingElement *QUmlCallBehaviorAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlCallBehaviorAction::clone() const QUmlCallBehaviorAction *c = new QUmlCallBehaviorAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -123,13 +115,9 @@ QModelingElement *QUmlCallBehaviorAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlInputPin *element, arguments()) c->addArgument(dynamic_cast<QUmlInputPin *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); c->setSynchronous(isSynchronous()); foreach (QUmlOutputPin *element, results()) c->addResult(dynamic_cast<QUmlOutputPin *>(element->clone())); - if (behavior()) - c->setBehavior(dynamic_cast<QUmlBehavior *>(behavior()->clone())); return c; } diff --git a/src/uml/qumlcallbehavioraction.h b/src/uml/qumlcallbehavioraction.h index 653cb615..504d30f1 100644 --- a/src/uml/qumlcallbehavioraction.h +++ b/src/uml/qumlcallbehavioraction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlCallBehaviorAction : public QUmlCallAction { public: explicit QUmlCallBehaviorAction(bool createQModelingObject = true); + virtual ~QUmlCallBehaviorAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcallevent.cpp b/src/uml/qumlcallevent.cpp index b9758663..492d258a 100644 --- a/src/uml/qumlcallevent.cpp +++ b/src/uml/qumlcallevent.cpp @@ -74,6 +74,14 @@ QUmlCallEvent::QUmlCallEvent(bool createQModelingObject) : } /*! + Destroys the QUmlCallEvent. + */ +QUmlCallEvent::~QUmlCallEvent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCallEvent. */ QModelingElement *QUmlCallEvent::clone() const @@ -81,18 +89,10 @@ QModelingElement *QUmlCallEvent::clone() const QUmlCallEvent *c = new QUmlCallEvent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (operation()) - c->setOperation(dynamic_cast<QUmlOperation *>(operation()->clone())); return c; } diff --git a/src/uml/qumlcallevent.h b/src/uml/qumlcallevent.h index 256ad784..b97cc96a 100644 --- a/src/uml/qumlcallevent.h +++ b/src/uml/qumlcallevent.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlCallEvent : public QUmlMessageEvent { public: explicit QUmlCallEvent(bool createQModelingObject = true); + virtual ~QUmlCallEvent(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcalloperationaction.cpp b/src/uml/qumlcalloperationaction.cpp index 82d1e6eb..66a5df07 100644 --- a/src/uml/qumlcalloperationaction.cpp +++ b/src/uml/qumlcalloperationaction.cpp @@ -87,6 +87,14 @@ QUmlCallOperationAction::QUmlCallOperationAction(bool createQModelingObject) : } /*! + Destroys the QUmlCallOperationAction. + */ +QUmlCallOperationAction::~QUmlCallOperationAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCallOperationAction. */ QModelingElement *QUmlCallOperationAction::clone() const @@ -94,27 +102,11 @@ QModelingElement *QUmlCallOperationAction::clone() const QUmlCallOperationAction *c = new QUmlCallOperationAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -124,13 +116,9 @@ QModelingElement *QUmlCallOperationAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlInputPin *element, arguments()) c->addArgument(dynamic_cast<QUmlInputPin *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); c->setSynchronous(isSynchronous()); foreach (QUmlOutputPin *element, results()) c->addResult(dynamic_cast<QUmlOutputPin *>(element->clone())); - if (operation()) - c->setOperation(dynamic_cast<QUmlOperation *>(operation()->clone())); if (target()) c->setTarget(dynamic_cast<QUmlInputPin *>(target()->clone())); return c; diff --git a/src/uml/qumlcalloperationaction.h b/src/uml/qumlcalloperationaction.h index d551fb4f..b475d259 100644 --- a/src/uml/qumlcalloperationaction.h +++ b/src/uml/qumlcalloperationaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlCallOperationAction : public QUmlCallAction { public: explicit QUmlCallOperationAction(bool createQModelingObject = true); + virtual ~QUmlCallOperationAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcentralbuffernode.cpp b/src/uml/qumlcentralbuffernode.cpp index be6c351a..f0170a26 100644 --- a/src/uml/qumlcentralbuffernode.cpp +++ b/src/uml/qumlcentralbuffernode.cpp @@ -83,6 +83,14 @@ QUmlCentralBufferNode::QUmlCentralBufferNode(bool createQModelingObject) } /*! + Destroys the QUmlCentralBufferNode. + */ +QUmlCentralBufferNode::~QUmlCentralBufferNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCentralBufferNode. */ QModelingElement *QUmlCentralBufferNode::clone() const @@ -90,35 +98,13 @@ QModelingElement *QUmlCentralBufferNode::clone() const QUmlCentralBufferNode *c = new QUmlCentralBufferNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); return c; diff --git a/src/uml/qumlcentralbuffernode.h b/src/uml/qumlcentralbuffernode.h index 0c9d8bca..464c7c53 100644 --- a/src/uml/qumlcentralbuffernode.h +++ b/src/uml/qumlcentralbuffernode.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlCentralBufferNode : public QUmlObjectNode { public: explicit QUmlCentralBufferNode(bool createQModelingObject = true); + virtual ~QUmlCentralBufferNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlchangeevent.cpp b/src/uml/qumlchangeevent.cpp index d7b45e11..6298e21a 100644 --- a/src/uml/qumlchangeevent.cpp +++ b/src/uml/qumlchangeevent.cpp @@ -74,6 +74,14 @@ QUmlChangeEvent::QUmlChangeEvent(bool createQModelingObject) : } /*! + Destroys the QUmlChangeEvent. + */ +QUmlChangeEvent::~QUmlChangeEvent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlChangeEvent. */ QModelingElement *QUmlChangeEvent::clone() const @@ -81,12 +89,6 @@ QModelingElement *QUmlChangeEvent::clone() const QUmlChangeEvent *c = new QUmlChangeEvent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlchangeevent.h b/src/uml/qumlchangeevent.h index 5a43a252..eee4a32b 100644 --- a/src/uml/qumlchangeevent.h +++ b/src/uml/qumlchangeevent.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlChangeEvent : public QUmlEvent { public: explicit QUmlChangeEvent(bool createQModelingObject = true); + virtual ~QUmlChangeEvent(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlclass.cpp b/src/uml/qumlclass.cpp index a8fc1648..01a972c3 100644 --- a/src/uml/qumlclass.cpp +++ b/src/uml/qumlclass.cpp @@ -100,6 +100,14 @@ QUmlClass::QUmlClass(bool createQModelingObject) : } /*! + Destroys the QUmlClass. + */ +QUmlClass::~QUmlClass() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlClass. */ QModelingElement *QUmlClass::clone() const @@ -107,8 +115,6 @@ QModelingElement *QUmlClass::clone() const QUmlClass *c = new QUmlClass; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -118,11 +124,7 @@ QModelingElement *QUmlClass::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -135,22 +137,10 @@ QModelingElement *QUmlClass::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumlclass.h b/src/uml/qumlclass.h index 81e4475c..9c77e021 100644 --- a/src/uml/qumlclass.h +++ b/src/uml/qumlclass.h @@ -61,6 +61,7 @@ class Q_UML_EXPORT QUmlClass : public QUmlEncapsulatedClassifier, public QUmlBeh { public: explicit QUmlClass(bool createQModelingObject = true); + virtual ~QUmlClass(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlclassifier.cpp b/src/uml/qumlclassifier.cpp index b9325397..94de2289 100644 --- a/src/uml/qumlclassifier.cpp +++ b/src/uml/qumlclassifier.cpp @@ -89,6 +89,14 @@ QUmlClassifier::QUmlClassifier() : } /*! + Destroys the QUmlClassifier. + */ +QUmlClassifier::~QUmlClassifier() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlClassifier. */ QModelingElement *QUmlClassifier::clone() const @@ -96,8 +104,6 @@ QModelingElement *QUmlClassifier::clone() const QUmlClassifier *c = new QUmlClassifier; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -107,11 +113,7 @@ QModelingElement *QUmlClassifier::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -125,18 +127,8 @@ QModelingElement *QUmlClassifier::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); return c; } diff --git a/src/uml/qumlclassifier.h b/src/uml/qumlclassifier.h index 3c6933d3..e7381024 100644 --- a/src/uml/qumlclassifier.h +++ b/src/uml/qumlclassifier.h @@ -66,6 +66,8 @@ class QUmlUseCase; class Q_UML_EXPORT QUmlClassifier : public QUmlNamespace, public QUmlType, public QUmlRedefinableElement, public QUmlTemplateableElement { public: + virtual ~QUmlClassifier(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlclassifiertemplateparameter.cpp b/src/uml/qumlclassifiertemplateparameter.cpp index 16447a0f..1deb8bb5 100644 --- a/src/uml/qumlclassifiertemplateparameter.cpp +++ b/src/uml/qumlclassifiertemplateparameter.cpp @@ -71,6 +71,14 @@ QUmlClassifierTemplateParameter::QUmlClassifierTemplateParameter(bool createQMod } /*! + Destroys the QUmlClassifierTemplateParameter. + */ +QUmlClassifierTemplateParameter::~QUmlClassifierTemplateParameter() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlClassifierTemplateParameter. */ QModelingElement *QUmlClassifierTemplateParameter::clone() const @@ -78,19 +86,11 @@ QModelingElement *QUmlClassifierTemplateParameter::clone() const QUmlClassifierTemplateParameter *c = new QUmlClassifierTemplateParameter; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (default_()) - c->setDefault(dynamic_cast<QUmlParameterableElement *>(default_()->clone())); if (ownedDefault()) c->setOwnedDefault(dynamic_cast<QUmlParameterableElement *>(ownedDefault()->clone())); if (ownedParameteredElement()) c->setOwnedParameteredElement(dynamic_cast<QUmlParameterableElement *>(ownedParameteredElement()->clone())); - if (signature()) - c->setSignature(dynamic_cast<QUmlTemplateSignature *>(signature()->clone())); c->setAllowSubstitutable(allowSubstitutable()); - foreach (QUmlClassifier *element, constrainingClassifiers()) - c->addConstrainingClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (parameteredElement()) - c->setParameteredElement(dynamic_cast<QUmlClassifier *>(parameteredElement()->clone())); return c; } diff --git a/src/uml/qumlclassifiertemplateparameter.h b/src/uml/qumlclassifiertemplateparameter.h index ec89ee91..00ad59d1 100644 --- a/src/uml/qumlclassifiertemplateparameter.h +++ b/src/uml/qumlclassifiertemplateparameter.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlClassifierTemplateParameter : public QUmlTemplateParamete { public: explicit QUmlClassifierTemplateParameter(bool createQModelingObject = true); + virtual ~QUmlClassifierTemplateParameter(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlclause.cpp b/src/uml/qumlclause.cpp index 2f8a8556..ffad4333 100644 --- a/src/uml/qumlclause.cpp +++ b/src/uml/qumlclause.cpp @@ -67,6 +67,14 @@ QUmlClause::QUmlClause(bool createQModelingObject) : } /*! + Destroys the QUmlClause. + */ +QUmlClause::~QUmlClause() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlClause. */ QModelingElement *QUmlClause::clone() const @@ -74,18 +82,6 @@ QModelingElement *QUmlClause::clone() const QUmlClause *c = new QUmlClause; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlExecutableNode *element, bodies()) - c->addBody(dynamic_cast<QUmlExecutableNode *>(element->clone())); - foreach (QUmlOutputPin *element, bodyOutputs()) - c->addBodyOutput(dynamic_cast<QUmlOutputPin *>(element->clone())); - if (decider()) - c->setDecider(dynamic_cast<QUmlOutputPin *>(decider()->clone())); - foreach (QUmlClause *element, predecessorClauses()) - c->addPredecessorClause(dynamic_cast<QUmlClause *>(element->clone())); - foreach (QUmlClause *element, successorClauses()) - c->addSuccessorClause(dynamic_cast<QUmlClause *>(element->clone())); - foreach (QUmlExecutableNode *element, tests()) - c->addTest(dynamic_cast<QUmlExecutableNode *>(element->clone())); return c; } diff --git a/src/uml/qumlclause.h b/src/uml/qumlclause.h index 24ed1794..303db522 100644 --- a/src/uml/qumlclause.h +++ b/src/uml/qumlclause.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlClause : public QUmlElement { public: explicit QUmlClause(bool createQModelingObject = true); + virtual ~QUmlClause(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlclearassociationaction.cpp b/src/uml/qumlclearassociationaction.cpp index f7fe85c6..f36653dc 100644 --- a/src/uml/qumlclearassociationaction.cpp +++ b/src/uml/qumlclearassociationaction.cpp @@ -86,6 +86,14 @@ QUmlClearAssociationAction::QUmlClearAssociationAction(bool createQModelingObjec } /*! + Destroys the QUmlClearAssociationAction. + */ +QUmlClearAssociationAction::~QUmlClearAssociationAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlClearAssociationAction. */ QModelingElement *QUmlClearAssociationAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlClearAssociationAction::clone() const QUmlClearAssociationAction *c = new QUmlClearAssociationAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,8 +113,6 @@ QModelingElement *QUmlClearAssociationAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (association()) - c->setAssociation(dynamic_cast<QUmlAssociation *>(association()->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); return c; diff --git a/src/uml/qumlclearassociationaction.h b/src/uml/qumlclearassociationaction.h index 841225b1..32fcc79a 100644 --- a/src/uml/qumlclearassociationaction.h +++ b/src/uml/qumlclearassociationaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlClearAssociationAction : public QUmlAction { public: explicit QUmlClearAssociationAction(bool createQModelingObject = true); + virtual ~QUmlClearAssociationAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlclearstructuralfeatureaction.cpp b/src/uml/qumlclearstructuralfeatureaction.cpp index 9b5b1d43..7e10a056 100644 --- a/src/uml/qumlclearstructuralfeatureaction.cpp +++ b/src/uml/qumlclearstructuralfeatureaction.cpp @@ -85,6 +85,14 @@ QUmlClearStructuralFeatureAction::QUmlClearStructuralFeatureAction(bool createQM } /*! + Destroys the QUmlClearStructuralFeatureAction. + */ +QUmlClearStructuralFeatureAction::~QUmlClearStructuralFeatureAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlClearStructuralFeatureAction. */ QModelingElement *QUmlClearStructuralFeatureAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlClearStructuralFeatureAction::clone() const QUmlClearStructuralFeatureAction *c = new QUmlClearStructuralFeatureAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -122,8 +114,6 @@ QModelingElement *QUmlClearStructuralFeatureAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - if (structuralFeature()) - c->setStructuralFeature(dynamic_cast<QUmlStructuralFeature *>(structuralFeature()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); return c; diff --git a/src/uml/qumlclearstructuralfeatureaction.h b/src/uml/qumlclearstructuralfeatureaction.h index 28d9f978..3d33df1e 100644 --- a/src/uml/qumlclearstructuralfeatureaction.h +++ b/src/uml/qumlclearstructuralfeatureaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlClearStructuralFeatureAction : public QUmlStructuralFeatu { public: explicit QUmlClearStructuralFeatureAction(bool createQModelingObject = true); + virtual ~QUmlClearStructuralFeatureAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlclearvariableaction.cpp b/src/uml/qumlclearvariableaction.cpp index b3f88d35..289b5c47 100644 --- a/src/uml/qumlclearvariableaction.cpp +++ b/src/uml/qumlclearvariableaction.cpp @@ -84,6 +84,14 @@ QUmlClearVariableAction::QUmlClearVariableAction(bool createQModelingObject) } /*! + Destroys the QUmlClearVariableAction. + */ +QUmlClearVariableAction::~QUmlClearVariableAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlClearVariableAction. */ QModelingElement *QUmlClearVariableAction::clone() const @@ -91,27 +99,11 @@ QModelingElement *QUmlClearVariableAction::clone() const QUmlClearVariableAction *c = new QUmlClearVariableAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -119,8 +111,6 @@ QModelingElement *QUmlClearVariableAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (variable()) - c->setVariable(dynamic_cast<QUmlVariable *>(variable()->clone())); return c; } diff --git a/src/uml/qumlclearvariableaction.h b/src/uml/qumlclearvariableaction.h index 2a6eb71f..30aae09a 100644 --- a/src/uml/qumlclearvariableaction.h +++ b/src/uml/qumlclearvariableaction.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlClearVariableAction : public QUmlVariableAction { public: explicit QUmlClearVariableAction(bool createQModelingObject = true); + virtual ~QUmlClearVariableAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcollaboration.cpp b/src/uml/qumlcollaboration.cpp index 0ef20787..7f7d8825 100644 --- a/src/uml/qumlcollaboration.cpp +++ b/src/uml/qumlcollaboration.cpp @@ -94,6 +94,14 @@ QUmlCollaboration::QUmlCollaboration(bool createQModelingObject) } /*! + Destroys the QUmlCollaboration. + */ +QUmlCollaboration::~QUmlCollaboration() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCollaboration. */ QModelingElement *QUmlCollaboration::clone() const @@ -101,8 +109,6 @@ QModelingElement *QUmlCollaboration::clone() const QUmlCollaboration *c = new QUmlCollaboration; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -112,11 +118,7 @@ QModelingElement *QUmlCollaboration::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -130,30 +132,16 @@ QModelingElement *QUmlCollaboration::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) c->addOwnedBehavior(dynamic_cast<QUmlBehavior *>(element->clone())); - foreach (QUmlConnectableElement *element, collaborationRoles()) - c->addCollaborationRole(dynamic_cast<QUmlConnectableElement *>(element->clone())); return c; } diff --git a/src/uml/qumlcollaboration.h b/src/uml/qumlcollaboration.h index 11f3c9ae..67fd7772 100644 --- a/src/uml/qumlcollaboration.h +++ b/src/uml/qumlcollaboration.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlCollaboration : public QUmlStructuredClassifier, public Q { public: explicit QUmlCollaboration(bool createQModelingObject = true); + virtual ~QUmlCollaboration(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcollaborationuse.cpp b/src/uml/qumlcollaborationuse.cpp index 2ec87bb4..d6fbbd9a 100644 --- a/src/uml/qumlcollaborationuse.cpp +++ b/src/uml/qumlcollaborationuse.cpp @@ -71,6 +71,14 @@ QUmlCollaborationUse::QUmlCollaborationUse(bool createQModelingObject) : } /*! + Destroys the QUmlCollaborationUse. + */ +QUmlCollaborationUse::~QUmlCollaborationUse() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCollaborationUse. */ QModelingElement *QUmlCollaborationUse::clone() const @@ -78,16 +86,12 @@ QModelingElement *QUmlCollaborationUse::clone() const QUmlCollaborationUse *c = new QUmlCollaborationUse; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); foreach (QUmlDependency *element, roleBindings()) c->addRoleBinding(dynamic_cast<QUmlDependency *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlCollaboration *>(type()->clone())); return c; } diff --git a/src/uml/qumlcollaborationuse.h b/src/uml/qumlcollaborationuse.h index 2ab77d98..3fddd662 100644 --- a/src/uml/qumlcollaborationuse.h +++ b/src/uml/qumlcollaborationuse.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlCollaborationUse : public QUmlNamedElement { public: explicit QUmlCollaborationUse(bool createQModelingObject = true); + virtual ~QUmlCollaborationUse(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcombinedfragment.cpp b/src/uml/qumlcombinedfragment.cpp index 4cbcffda..6ff582f9 100644 --- a/src/uml/qumlcombinedfragment.cpp +++ b/src/uml/qumlcombinedfragment.cpp @@ -76,6 +76,14 @@ QUmlCombinedFragment::QUmlCombinedFragment(bool createQModelingObject) : } /*! + Destroys the QUmlCombinedFragment. + */ +QUmlCombinedFragment::~QUmlCombinedFragment() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCombinedFragment. */ QModelingElement *QUmlCombinedFragment::clone() const @@ -83,18 +91,10 @@ QModelingElement *QUmlCombinedFragment::clone() const QUmlCombinedFragment *c = new QUmlCombinedFragment; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); foreach (QUmlGate *element, cfragmentGates()) diff --git a/src/uml/qumlcombinedfragment.h b/src/uml/qumlcombinedfragment.h index ebcf5612..44efb502 100644 --- a/src/uml/qumlcombinedfragment.h +++ b/src/uml/qumlcombinedfragment.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlCombinedFragment : public QUmlInteractionFragment { public: explicit QUmlCombinedFragment(bool createQModelingObject = true); + virtual ~QUmlCombinedFragment(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcomment.cpp b/src/uml/qumlcomment.cpp index b7ac6f33..94f5f980 100644 --- a/src/uml/qumlcomment.cpp +++ b/src/uml/qumlcomment.cpp @@ -62,6 +62,14 @@ QUmlComment::QUmlComment(bool createQModelingObject) } /*! + Destroys the QUmlComment. + */ +QUmlComment::~QUmlComment() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlComment. */ QModelingElement *QUmlComment::clone() const @@ -69,8 +77,6 @@ QModelingElement *QUmlComment::clone() const QUmlComment *c = new QUmlComment; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlElement *element, annotatedElements()) - c->addAnnotatedElement(dynamic_cast<QUmlElement *>(element->clone())); c->setBody(body()); return c; } diff --git a/src/uml/qumlcomment.h b/src/uml/qumlcomment.h index 55b6411d..1813f774 100644 --- a/src/uml/qumlcomment.h +++ b/src/uml/qumlcomment.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlComment : public QUmlElement { public: explicit QUmlComment(bool createQModelingObject = true); + virtual ~QUmlComment(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcommunicationpath.cpp b/src/uml/qumlcommunicationpath.cpp index 0cf45a98..22a7f050 100644 --- a/src/uml/qumlcommunicationpath.cpp +++ b/src/uml/qumlcommunicationpath.cpp @@ -91,6 +91,14 @@ QUmlCommunicationPath::QUmlCommunicationPath(bool createQModelingObject) : } /*! + Destroys the QUmlCommunicationPath. + */ +QUmlCommunicationPath::~QUmlCommunicationPath() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCommunicationPath. */ QModelingElement *QUmlCommunicationPath::clone() const @@ -98,8 +106,6 @@ QModelingElement *QUmlCommunicationPath::clone() const QUmlCommunicationPath *c = new QUmlCommunicationPath; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -109,11 +115,7 @@ QModelingElement *QUmlCommunicationPath::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -127,23 +129,9 @@ QModelingElement *QUmlCommunicationPath::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); c->setDerived(isDerived()); - foreach (QUmlProperty *element, memberEnds()) - c->addMemberEnd(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, navigableOwnedEnds()) - c->addNavigableOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlProperty *element, ownedEnds()) c->addOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone())); return c; diff --git a/src/uml/qumlcommunicationpath.h b/src/uml/qumlcommunicationpath.h index 58e816c4..d60cc05c 100644 --- a/src/uml/qumlcommunicationpath.h +++ b/src/uml/qumlcommunicationpath.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlCommunicationPath : public QUmlAssociation { public: explicit QUmlCommunicationPath(bool createQModelingObject = true); + virtual ~QUmlCommunicationPath(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcomponent.cpp b/src/uml/qumlcomponent.cpp index b153a807..0d8e2dd9 100644 --- a/src/uml/qumlcomponent.cpp +++ b/src/uml/qumlcomponent.cpp @@ -102,6 +102,14 @@ QUmlComponent::QUmlComponent(bool createQModelingObject) : } /*! + Destroys the QUmlComponent. + */ +QUmlComponent::~QUmlComponent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlComponent. */ QModelingElement *QUmlComponent::clone() const @@ -109,8 +117,6 @@ QModelingElement *QUmlComponent::clone() const QUmlComponent *c = new QUmlComponent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -120,11 +126,7 @@ QModelingElement *QUmlComponent::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -137,22 +139,10 @@ QModelingElement *QUmlComponent::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumlcomponent.h b/src/uml/qumlcomponent.h index 0f6e928e..282f1197 100644 --- a/src/uml/qumlcomponent.h +++ b/src/uml/qumlcomponent.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlComponent : public QUmlClass { public: explicit QUmlComponent(bool createQModelingObject = true); + virtual ~QUmlComponent(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcomponentrealization.cpp b/src/uml/qumlcomponentrealization.cpp index 027fb356..02d145e2 100644 --- a/src/uml/qumlcomponentrealization.cpp +++ b/src/uml/qumlcomponentrealization.cpp @@ -77,6 +77,14 @@ QUmlComponentRealization::QUmlComponentRealization(bool createQModelingObject) : } /*! + Destroys the QUmlComponentRealization. + */ +QUmlComponentRealization::~QUmlComponentRealization() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlComponentRealization. */ QModelingElement *QUmlComponentRealization::clone() const @@ -84,26 +92,12 @@ QModelingElement *QUmlComponentRealization::clone() const QUmlComponentRealization *c = new QUmlComponentRealization; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); if (mapping()) c->setMapping(dynamic_cast<QUmlOpaqueExpression *>(mapping()->clone())); - if (abstraction()) - c->setAbstraction(dynamic_cast<QUmlComponent *>(abstraction()->clone())); - foreach (QUmlClassifier *element, realizingClassifiers()) - c->addRealizingClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); return c; } diff --git a/src/uml/qumlcomponentrealization.h b/src/uml/qumlcomponentrealization.h index b624c74b..2c5f739b 100644 --- a/src/uml/qumlcomponentrealization.h +++ b/src/uml/qumlcomponentrealization.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlComponentRealization : public QUmlRealization { public: explicit QUmlComponentRealization(bool createQModelingObject = true); + virtual ~QUmlComponentRealization(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlconditionalnode.cpp b/src/uml/qumlconditionalnode.cpp index eaaaeac0..7d531b90 100644 --- a/src/uml/qumlconditionalnode.cpp +++ b/src/uml/qumlconditionalnode.cpp @@ -90,6 +90,14 @@ QUmlConditionalNode::QUmlConditionalNode(bool createQModelingObject) : } /*! + Destroys the QUmlConditionalNode. + */ +QUmlConditionalNode::~QUmlConditionalNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConditionalNode. */ QModelingElement *QUmlConditionalNode::clone() const @@ -97,25 +105,11 @@ QModelingElement *QUmlConditionalNode::clone() const QUmlConditionalNode *c = new QUmlConditionalNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -129,8 +123,6 @@ QModelingElement *QUmlConditionalNode::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); foreach (QUmlActivityEdge *element, edges()) c->addEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); c->setMustIsolate(mustIsolate()); diff --git a/src/uml/qumlconditionalnode.h b/src/uml/qumlconditionalnode.h index 3418159c..55c46ed2 100644 --- a/src/uml/qumlconditionalnode.h +++ b/src/uml/qumlconditionalnode.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlConditionalNode : public QUmlStructuredActivityNode { public: explicit QUmlConditionalNode(bool createQModelingObject = true); + virtual ~QUmlConditionalNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlconnectableelement.cpp b/src/uml/qumlconnectableelement.cpp index dbae0a49..ed8f1825 100644 --- a/src/uml/qumlconnectableelement.cpp +++ b/src/uml/qumlconnectableelement.cpp @@ -73,6 +73,14 @@ QUmlConnectableElement::QUmlConnectableElement() : } /*! + Destroys the QUmlConnectableElement. + */ +QUmlConnectableElement::~QUmlConnectableElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConnectableElement. */ QModelingElement *QUmlConnectableElement::clone() const @@ -80,18 +88,10 @@ QModelingElement *QUmlConnectableElement::clone() const QUmlConnectableElement *c = new QUmlConnectableElement; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlConnectableElementTemplateParameter *>(templateParameter()->clone())); return c; } diff --git a/src/uml/qumlconnectableelement.h b/src/uml/qumlconnectableelement.h index f0218382..225e63b3 100644 --- a/src/uml/qumlconnectableelement.h +++ b/src/uml/qumlconnectableelement.h @@ -56,6 +56,8 @@ class QUmlConnectorEnd; class Q_UML_EXPORT QUmlConnectableElement : public virtual QUmlTypedElement, public QUmlParameterableElement { public: + virtual ~QUmlConnectableElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlconnectableelementtemplateparameter.cpp b/src/uml/qumlconnectableelementtemplateparameter.cpp index 66641693..c3f56789 100644 --- a/src/uml/qumlconnectableelementtemplateparameter.cpp +++ b/src/uml/qumlconnectableelementtemplateparameter.cpp @@ -70,6 +70,14 @@ QUmlConnectableElementTemplateParameter::QUmlConnectableElementTemplateParameter } /*! + Destroys the QUmlConnectableElementTemplateParameter. + */ +QUmlConnectableElementTemplateParameter::~QUmlConnectableElementTemplateParameter() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConnectableElementTemplateParameter. */ QModelingElement *QUmlConnectableElementTemplateParameter::clone() const @@ -77,16 +85,10 @@ QModelingElement *QUmlConnectableElementTemplateParameter::clone() const QUmlConnectableElementTemplateParameter *c = new QUmlConnectableElementTemplateParameter; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (default_()) - c->setDefault(dynamic_cast<QUmlParameterableElement *>(default_()->clone())); if (ownedDefault()) c->setOwnedDefault(dynamic_cast<QUmlParameterableElement *>(ownedDefault()->clone())); if (ownedParameteredElement()) c->setOwnedParameteredElement(dynamic_cast<QUmlParameterableElement *>(ownedParameteredElement()->clone())); - if (signature()) - c->setSignature(dynamic_cast<QUmlTemplateSignature *>(signature()->clone())); - if (parameteredElement()) - c->setParameteredElement(dynamic_cast<QUmlConnectableElement *>(parameteredElement()->clone())); return c; } diff --git a/src/uml/qumlconnectableelementtemplateparameter.h b/src/uml/qumlconnectableelementtemplateparameter.h index 4df3cea2..ee848781 100644 --- a/src/uml/qumlconnectableelementtemplateparameter.h +++ b/src/uml/qumlconnectableelementtemplateparameter.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlConnectableElementTemplateParameter : public QUmlTemplate { public: explicit QUmlConnectableElementTemplateParameter(bool createQModelingObject = true); + virtual ~QUmlConnectableElementTemplateParameter(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlconnectionpointreference.cpp b/src/uml/qumlconnectionpointreference.cpp index f017fe6d..ae2a7e99 100644 --- a/src/uml/qumlconnectionpointreference.cpp +++ b/src/uml/qumlconnectionpointreference.cpp @@ -76,6 +76,14 @@ QUmlConnectionPointReference::QUmlConnectionPointReference(bool createQModelingO } /*! + Destroys the QUmlConnectionPointReference. + */ +QUmlConnectionPointReference::~QUmlConnectionPointReference() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConnectionPointReference. */ QModelingElement *QUmlConnectionPointReference::clone() const @@ -83,20 +91,10 @@ QModelingElement *QUmlConnectionPointReference::clone() const QUmlConnectionPointReference *c = new QUmlConnectionPointReference; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (container()) - c->setContainer(dynamic_cast<QUmlRegion *>(container()->clone())); - foreach (QUmlPseudostate *element, entries()) - c->addEntry(dynamic_cast<QUmlPseudostate *>(element->clone())); - foreach (QUmlPseudostate *element, exits()) - c->addExit(dynamic_cast<QUmlPseudostate *>(element->clone())); - if (state()) - c->setState(dynamic_cast<QUmlState *>(state()->clone())); return c; } diff --git a/src/uml/qumlconnectionpointreference.h b/src/uml/qumlconnectionpointreference.h index dd945259..3ffef938 100644 --- a/src/uml/qumlconnectionpointreference.h +++ b/src/uml/qumlconnectionpointreference.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlConnectionPointReference : public QUmlVertex { public: explicit QUmlConnectionPointReference(bool createQModelingObject = true); + virtual ~QUmlConnectionPointReference(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlconnector.cpp b/src/uml/qumlconnector.cpp index 46afe498..13319c2a 100644 --- a/src/uml/qumlconnector.cpp +++ b/src/uml/qumlconnector.cpp @@ -78,6 +78,14 @@ QUmlConnector::QUmlConnector(bool createQModelingObject) : } /*! + Destroys the QUmlConnector. + */ +QUmlConnector::~QUmlConnector() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConnector. */ QModelingElement *QUmlConnector::clone() const @@ -85,22 +93,14 @@ QModelingElement *QUmlConnector::clone() const QUmlConnector *c = new QUmlConnector; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); c->setStatic(isStatic()); - foreach (QUmlBehavior *element, contracts()) - c->addContract(dynamic_cast<QUmlBehavior *>(element->clone())); foreach (QUmlConnectorEnd *element, ends()) c->addEnd(dynamic_cast<QUmlConnectorEnd *>(element->clone())); - foreach (QUmlConnector *element, redefinedConnectors()) - c->addRedefinedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlAssociation *>(type()->clone())); return c; } diff --git a/src/uml/qumlconnector.h b/src/uml/qumlconnector.h index 949d1596..77c4358f 100644 --- a/src/uml/qumlconnector.h +++ b/src/uml/qumlconnector.h @@ -59,6 +59,7 @@ class Q_UML_EXPORT QUmlConnector : public QUmlFeature { public: explicit QUmlConnector(bool createQModelingObject = true); + virtual ~QUmlConnector(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlconnectorend.cpp b/src/uml/qumlconnectorend.cpp index ee969c97..2c71c24d 100644 --- a/src/uml/qumlconnectorend.cpp +++ b/src/uml/qumlconnectorend.cpp @@ -70,6 +70,14 @@ QUmlConnectorEnd::QUmlConnectorEnd(bool createQModelingObject) : } /*! + Destroys the QUmlConnectorEnd. + */ +QUmlConnectorEnd::~QUmlConnectorEnd() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConnectorEnd. */ QModelingElement *QUmlConnectorEnd::clone() const @@ -83,10 +91,6 @@ QModelingElement *QUmlConnectorEnd::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - if (partWithPort()) - c->setPartWithPort(dynamic_cast<QUmlProperty *>(partWithPort()->clone())); - if (role()) - c->setRole(dynamic_cast<QUmlConnectableElement *>(role()->clone())); return c; } diff --git a/src/uml/qumlconnectorend.h b/src/uml/qumlconnectorend.h index 33e9cf17..d64ef3c7 100644 --- a/src/uml/qumlconnectorend.h +++ b/src/uml/qumlconnectorend.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlConnectorEnd : public QUmlMultiplicityElement { public: explicit QUmlConnectorEnd(bool createQModelingObject = true); + virtual ~QUmlConnectorEnd(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlconsiderignorefragment.cpp b/src/uml/qumlconsiderignorefragment.cpp index 3b3b9fc1..f12d694f 100644 --- a/src/uml/qumlconsiderignorefragment.cpp +++ b/src/uml/qumlconsiderignorefragment.cpp @@ -76,6 +76,14 @@ QUmlConsiderIgnoreFragment::QUmlConsiderIgnoreFragment(bool createQModelingObjec } /*! + Destroys the QUmlConsiderIgnoreFragment. + */ +QUmlConsiderIgnoreFragment::~QUmlConsiderIgnoreFragment() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConsiderIgnoreFragment. */ QModelingElement *QUmlConsiderIgnoreFragment::clone() const @@ -83,18 +91,10 @@ QModelingElement *QUmlConsiderIgnoreFragment::clone() const QUmlConsiderIgnoreFragment *c = new QUmlConsiderIgnoreFragment; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); foreach (QUmlGate *element, cfragmentGates()) @@ -102,8 +102,6 @@ QModelingElement *QUmlConsiderIgnoreFragment::clone() const c->setInteractionOperator(interactionOperator()); foreach (QUmlInteractionOperand *element, operands()) c->addOperand(dynamic_cast<QUmlInteractionOperand *>(element->clone())); - foreach (QUmlNamedElement *element, messages()) - c->addMessage(dynamic_cast<QUmlNamedElement *>(element->clone())); return c; } diff --git a/src/uml/qumlconsiderignorefragment.h b/src/uml/qumlconsiderignorefragment.h index 7137d9ba..83bdc85d 100644 --- a/src/uml/qumlconsiderignorefragment.h +++ b/src/uml/qumlconsiderignorefragment.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlConsiderIgnoreFragment : public QUmlCombinedFragment { public: explicit QUmlConsiderIgnoreFragment(bool createQModelingObject = true); + virtual ~QUmlConsiderIgnoreFragment(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlconstraint.cpp b/src/uml/qumlconstraint.cpp index 78beab37..467bec8e 100644 --- a/src/uml/qumlconstraint.cpp +++ b/src/uml/qumlconstraint.cpp @@ -75,6 +75,14 @@ QUmlConstraint::QUmlConstraint(bool createQModelingObject) : } /*! + Destroys the QUmlConstraint. + */ +QUmlConstraint::~QUmlConstraint() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlConstraint. */ QModelingElement *QUmlConstraint::clone() const @@ -82,20 +90,10 @@ QModelingElement *QUmlConstraint::clone() const QUmlConstraint *c = new QUmlConstraint; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlElement *element, constrainedElements()) - c->addConstrainedElement(dynamic_cast<QUmlElement *>(element->clone())); - if (context()) - c->setContext(dynamic_cast<QUmlNamespace *>(context()->clone())); if (specification()) c->setSpecification(dynamic_cast<QUmlValueSpecification *>(specification()->clone())); return c; diff --git a/src/uml/qumlconstraint.h b/src/uml/qumlconstraint.h index 2b227809..d975a596 100644 --- a/src/uml/qumlconstraint.h +++ b/src/uml/qumlconstraint.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlConstraint : public QUmlPackageableElement { public: explicit QUmlConstraint(bool createQModelingObject = true); + virtual ~QUmlConstraint(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcontinuation.cpp b/src/uml/qumlcontinuation.cpp index 93a5237d..1628bf48 100644 --- a/src/uml/qumlcontinuation.cpp +++ b/src/uml/qumlcontinuation.cpp @@ -75,6 +75,14 @@ QUmlContinuation::QUmlContinuation(bool createQModelingObject) : } /*! + Destroys the QUmlContinuation. + */ +QUmlContinuation::~QUmlContinuation() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlContinuation. */ QModelingElement *QUmlContinuation::clone() const @@ -82,18 +90,10 @@ QModelingElement *QUmlContinuation::clone() const QUmlContinuation *c = new QUmlContinuation; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); c->setSetting(setting()); diff --git a/src/uml/qumlcontinuation.h b/src/uml/qumlcontinuation.h index a582fc46..546eb9f1 100644 --- a/src/uml/qumlcontinuation.h +++ b/src/uml/qumlcontinuation.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlContinuation : public QUmlInteractionFragment { public: explicit QUmlContinuation(bool createQModelingObject = true); + virtual ~QUmlContinuation(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcontrolflow.cpp b/src/uml/qumlcontrolflow.cpp index e8eb2eeb..202155bc 100644 --- a/src/uml/qumlcontrolflow.cpp +++ b/src/uml/qumlcontrolflow.cpp @@ -79,6 +79,14 @@ QUmlControlFlow::QUmlControlFlow(bool createQModelingObject) } /*! + Destroys the QUmlControlFlow. + */ +QUmlControlFlow::~QUmlControlFlow() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlControlFlow. */ QModelingElement *QUmlControlFlow::clone() const @@ -86,29 +94,13 @@ QModelingElement *QUmlControlFlow::clone() const QUmlControlFlow *c = new QUmlControlFlow; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); if (guard()) c->setGuard(dynamic_cast<QUmlValueSpecification *>(guard()->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - if (interrupts()) - c->setInterrupts(dynamic_cast<QUmlInterruptibleActivityRegion *>(interrupts()->clone())); - foreach (QUmlActivityEdge *element, redefinedEdges()) - c->addRedefinedEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); - if (source()) - c->setSource(dynamic_cast<QUmlActivityNode *>(source()->clone())); - if (target()) - c->setTarget(dynamic_cast<QUmlActivityNode *>(target()->clone())); if (weight()) c->setWeight(dynamic_cast<QUmlValueSpecification *>(weight()->clone())); return c; diff --git a/src/uml/qumlcontrolflow.h b/src/uml/qumlcontrolflow.h index f7eccb31..46ef5a49 100644 --- a/src/uml/qumlcontrolflow.h +++ b/src/uml/qumlcontrolflow.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlControlFlow : public QUmlActivityEdge { public: explicit QUmlControlFlow(bool createQModelingObject = true); + virtual ~QUmlControlFlow(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcontrolnode.cpp b/src/uml/qumlcontrolnode.cpp index 9223f46e..3f99d024 100644 --- a/src/uml/qumlcontrolnode.cpp +++ b/src/uml/qumlcontrolnode.cpp @@ -76,6 +76,14 @@ QUmlControlNode::QUmlControlNode() } /*! + Destroys the QUmlControlNode. + */ +QUmlControlNode::~QUmlControlNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlControlNode. */ QModelingElement *QUmlControlNode::clone() const @@ -83,27 +91,11 @@ QModelingElement *QUmlControlNode::clone() const QUmlControlNode *c = new QUmlControlNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlcontrolnode.h b/src/uml/qumlcontrolnode.h index 22324d59..8d607519 100644 --- a/src/uml/qumlcontrolnode.h +++ b/src/uml/qumlcontrolnode.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlControlNode : public QUmlActivityNode { public: + virtual ~QUmlControlNode(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcreatelinkaction.cpp b/src/uml/qumlcreatelinkaction.cpp index 9fe71f2a..fe22126d 100644 --- a/src/uml/qumlcreatelinkaction.cpp +++ b/src/uml/qumlcreatelinkaction.cpp @@ -86,6 +86,14 @@ QUmlCreateLinkAction::QUmlCreateLinkAction(bool createQModelingObject) } /*! + Destroys the QUmlCreateLinkAction. + */ +QUmlCreateLinkAction::~QUmlCreateLinkAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCreateLinkAction. */ QModelingElement *QUmlCreateLinkAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlCreateLinkAction::clone() const QUmlCreateLinkAction *c = new QUmlCreateLinkAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlcreatelinkaction.h b/src/uml/qumlcreatelinkaction.h index 7571b39e..6b8670e5 100644 --- a/src/uml/qumlcreatelinkaction.h +++ b/src/uml/qumlcreatelinkaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlCreateLinkAction : public QUmlWriteLinkAction { public: explicit QUmlCreateLinkAction(bool createQModelingObject = true); + virtual ~QUmlCreateLinkAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcreatelinkobjectaction.cpp b/src/uml/qumlcreatelinkobjectaction.cpp index dbdf3f71..2b9d1112 100644 --- a/src/uml/qumlcreatelinkobjectaction.cpp +++ b/src/uml/qumlcreatelinkobjectaction.cpp @@ -88,6 +88,14 @@ QUmlCreateLinkObjectAction::QUmlCreateLinkObjectAction(bool createQModelingObjec } /*! + Destroys the QUmlCreateLinkObjectAction. + */ +QUmlCreateLinkObjectAction::~QUmlCreateLinkObjectAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCreateLinkObjectAction. */ QModelingElement *QUmlCreateLinkObjectAction::clone() const @@ -95,27 +103,11 @@ QModelingElement *QUmlCreateLinkObjectAction::clone() const QUmlCreateLinkObjectAction *c = new QUmlCreateLinkObjectAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlcreatelinkobjectaction.h b/src/uml/qumlcreatelinkobjectaction.h index f5f23128..c7106295 100644 --- a/src/uml/qumlcreatelinkobjectaction.h +++ b/src/uml/qumlcreatelinkobjectaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlCreateLinkObjectAction : public QUmlCreateLinkAction { public: explicit QUmlCreateLinkObjectAction(bool createQModelingObject = true); + virtual ~QUmlCreateLinkObjectAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlcreateobjectaction.cpp b/src/uml/qumlcreateobjectaction.cpp index 3ca1525a..b18e8ed8 100644 --- a/src/uml/qumlcreateobjectaction.cpp +++ b/src/uml/qumlcreateobjectaction.cpp @@ -85,6 +85,14 @@ QUmlCreateObjectAction::QUmlCreateObjectAction(bool createQModelingObject) : } /*! + Destroys the QUmlCreateObjectAction. + */ +QUmlCreateObjectAction::~QUmlCreateObjectAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlCreateObjectAction. */ QModelingElement *QUmlCreateObjectAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlCreateObjectAction::clone() const QUmlCreateObjectAction *c = new QUmlCreateObjectAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -120,8 +112,6 @@ QModelingElement *QUmlCreateObjectAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (classifier()) - c->setClassifier(dynamic_cast<QUmlClassifier *>(classifier()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); return c; diff --git a/src/uml/qumlcreateobjectaction.h b/src/uml/qumlcreateobjectaction.h index c6d5078c..5a6fa11e 100644 --- a/src/uml/qumlcreateobjectaction.h +++ b/src/uml/qumlcreateobjectaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlCreateObjectAction : public QUmlAction { public: explicit QUmlCreateObjectAction(bool createQModelingObject = true); + virtual ~QUmlCreateObjectAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldatastorenode.cpp b/src/uml/qumldatastorenode.cpp index 602436b2..bab9f4f5 100644 --- a/src/uml/qumldatastorenode.cpp +++ b/src/uml/qumldatastorenode.cpp @@ -84,6 +84,14 @@ QUmlDataStoreNode::QUmlDataStoreNode(bool createQModelingObject) : } /*! + Destroys the QUmlDataStoreNode. + */ +QUmlDataStoreNode::~QUmlDataStoreNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDataStoreNode. */ QModelingElement *QUmlDataStoreNode::clone() const @@ -91,35 +99,13 @@ QModelingElement *QUmlDataStoreNode::clone() const QUmlDataStoreNode *c = new QUmlDataStoreNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); return c; diff --git a/src/uml/qumldatastorenode.h b/src/uml/qumldatastorenode.h index 69cbb7a7..add6b59c 100644 --- a/src/uml/qumldatastorenode.h +++ b/src/uml/qumldatastorenode.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlDataStoreNode : public QUmlCentralBufferNode { public: explicit QUmlDataStoreNode(bool createQModelingObject = true); + virtual ~QUmlDataStoreNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldatatype.cpp b/src/uml/qumldatatype.cpp index 015a0bf1..a104191a 100644 --- a/src/uml/qumldatatype.cpp +++ b/src/uml/qumldatatype.cpp @@ -90,6 +90,14 @@ QUmlDataType::QUmlDataType(bool createQModelingObject) } /*! + Destroys the QUmlDataType. + */ +QUmlDataType::~QUmlDataType() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDataType. */ QModelingElement *QUmlDataType::clone() const @@ -97,8 +105,6 @@ QModelingElement *QUmlDataType::clone() const QUmlDataType *c = new QUmlDataType; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -108,11 +114,7 @@ QModelingElement *QUmlDataType::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -126,18 +128,8 @@ QModelingElement *QUmlDataType::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlOperation *element, ownedOperations()) diff --git a/src/uml/qumldatatype.h b/src/uml/qumldatatype.h index 98b925f0..564db5a1 100644 --- a/src/uml/qumldatatype.h +++ b/src/uml/qumldatatype.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlDataType : public QUmlClassifier { public: explicit QUmlDataType(bool createQModelingObject = true); + virtual ~QUmlDataType(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldecisionnode.cpp b/src/uml/qumldecisionnode.cpp index e6366a9f..688a4fb2 100644 --- a/src/uml/qumldecisionnode.cpp +++ b/src/uml/qumldecisionnode.cpp @@ -83,6 +83,14 @@ QUmlDecisionNode::QUmlDecisionNode(bool createQModelingObject) : } /*! + Destroys the QUmlDecisionNode. + */ +QUmlDecisionNode::~QUmlDecisionNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDecisionNode. */ QModelingElement *QUmlDecisionNode::clone() const @@ -90,31 +98,11 @@ QModelingElement *QUmlDecisionNode::clone() const QUmlDecisionNode *c = new QUmlDecisionNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (decisionInput()) - c->setDecisionInput(dynamic_cast<QUmlBehavior *>(decisionInput()->clone())); - if (decisionInputFlow()) - c->setDecisionInputFlow(dynamic_cast<QUmlObjectFlow *>(decisionInputFlow()->clone())); return c; } diff --git a/src/uml/qumldecisionnode.h b/src/uml/qumldecisionnode.h index 07cf9999..3dff37dc 100644 --- a/src/uml/qumldecisionnode.h +++ b/src/uml/qumldecisionnode.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlDecisionNode : public QUmlControlNode { public: explicit QUmlDecisionNode(bool createQModelingObject = true); + virtual ~QUmlDecisionNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldependency.cpp b/src/uml/qumldependency.cpp index 6620b41e..b0dc7e64 100644 --- a/src/uml/qumldependency.cpp +++ b/src/uml/qumldependency.cpp @@ -71,6 +71,14 @@ QUmlDependency::QUmlDependency(bool createQModelingObject) } /*! + Destroys the QUmlDependency. + */ +QUmlDependency::~QUmlDependency() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDependency. */ QModelingElement *QUmlDependency::clone() const @@ -78,20 +86,10 @@ QModelingElement *QUmlDependency::clone() const QUmlDependency *c = new QUmlDependency; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); return c; } diff --git a/src/uml/qumldependency.h b/src/uml/qumldependency.h index b0f75b8b..c5b34a46 100644 --- a/src/uml/qumldependency.h +++ b/src/uml/qumldependency.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlDependency : public QUmlPackageableElement, public QUmlDi { public: explicit QUmlDependency(bool createQModelingObject = true); + virtual ~QUmlDependency(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldeployedartifact.cpp b/src/uml/qumldeployedartifact.cpp index a1b3f2dc..b47546ab 100644 --- a/src/uml/qumldeployedartifact.cpp +++ b/src/uml/qumldeployedartifact.cpp @@ -67,6 +67,14 @@ QUmlDeployedArtifact::QUmlDeployedArtifact() } /*! + Destroys the QUmlDeployedArtifact. + */ +QUmlDeployedArtifact::~QUmlDeployedArtifact() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDeployedArtifact. */ QModelingElement *QUmlDeployedArtifact::clone() const @@ -74,8 +82,6 @@ QModelingElement *QUmlDeployedArtifact::clone() const QUmlDeployedArtifact *c = new QUmlDeployedArtifact; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumldeployedartifact.h b/src/uml/qumldeployedartifact.h index 10305ec7..1fdcabf2 100644 --- a/src/uml/qumldeployedartifact.h +++ b/src/uml/qumldeployedartifact.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlDeployedArtifact : public virtual QUmlNamedElement { public: + virtual ~QUmlDeployedArtifact(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumldeployment.cpp b/src/uml/qumldeployment.cpp index a536ed3d..4a1c21e8 100644 --- a/src/uml/qumldeployment.cpp +++ b/src/uml/qumldeployment.cpp @@ -76,6 +76,14 @@ QUmlDeployment::QUmlDeployment(bool createQModelingObject) : } /*! + Destroys the QUmlDeployment. + */ +QUmlDeployment::~QUmlDeployment() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDeployment. */ QModelingElement *QUmlDeployment::clone() const @@ -83,26 +91,12 @@ QModelingElement *QUmlDeployment::clone() const QUmlDeployment *c = new QUmlDeployment; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); foreach (QUmlDeploymentSpecification *element, configurations()) c->addConfiguration(dynamic_cast<QUmlDeploymentSpecification *>(element->clone())); - foreach (QUmlDeployedArtifact *element, deployedArtifacts()) - c->addDeployedArtifact(dynamic_cast<QUmlDeployedArtifact *>(element->clone())); - if (location()) - c->setLocation(dynamic_cast<QUmlDeploymentTarget *>(location()->clone())); return c; } diff --git a/src/uml/qumldeployment.h b/src/uml/qumldeployment.h index c1342528..421212da 100644 --- a/src/uml/qumldeployment.h +++ b/src/uml/qumldeployment.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlDeployment : public QUmlDependency { public: explicit QUmlDeployment(bool createQModelingObject = true); + virtual ~QUmlDeployment(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldeploymentspecification.cpp b/src/uml/qumldeploymentspecification.cpp index c9188596..ce5c2a74 100644 --- a/src/uml/qumldeploymentspecification.cpp +++ b/src/uml/qumldeploymentspecification.cpp @@ -95,6 +95,14 @@ QUmlDeploymentSpecification::QUmlDeploymentSpecification(bool createQModelingObj } /*! + Destroys the QUmlDeploymentSpecification. + */ +QUmlDeploymentSpecification::~QUmlDeploymentSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDeploymentSpecification. */ QModelingElement *QUmlDeploymentSpecification::clone() const @@ -102,8 +110,6 @@ QModelingElement *QUmlDeploymentSpecification::clone() const QUmlDeploymentSpecification *c = new QUmlDeploymentSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -113,11 +119,7 @@ QModelingElement *QUmlDeploymentSpecification::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -131,18 +133,8 @@ QModelingElement *QUmlDeploymentSpecification::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); c->setFileName(fileName()); foreach (QUmlManifestation *element, manifestations()) c->addManifestation(dynamic_cast<QUmlManifestation *>(element->clone())); @@ -152,8 +144,6 @@ QModelingElement *QUmlDeploymentSpecification::clone() const c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlOperation *element, ownedOperations()) c->addOwnedOperation(dynamic_cast<QUmlOperation *>(element->clone())); - if (deployment()) - c->setDeployment(dynamic_cast<QUmlDeployment *>(deployment()->clone())); c->setDeploymentLocation(deploymentLocation()); c->setExecutionLocation(executionLocation()); return c; diff --git a/src/uml/qumldeploymentspecification.h b/src/uml/qumldeploymentspecification.h index 0f1df929..d72403ed 100644 --- a/src/uml/qumldeploymentspecification.h +++ b/src/uml/qumldeploymentspecification.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlDeploymentSpecification : public QUmlArtifact { public: explicit QUmlDeploymentSpecification(bool createQModelingObject = true); + virtual ~QUmlDeploymentSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldeploymenttarget.cpp b/src/uml/qumldeploymenttarget.cpp index ac1c14b5..797eca13 100644 --- a/src/uml/qumldeploymenttarget.cpp +++ b/src/uml/qumldeploymenttarget.cpp @@ -69,6 +69,14 @@ QUmlDeploymentTarget::QUmlDeploymentTarget() } /*! + Destroys the QUmlDeploymentTarget. + */ +QUmlDeploymentTarget::~QUmlDeploymentTarget() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDeploymentTarget. */ QModelingElement *QUmlDeploymentTarget::clone() const @@ -76,8 +84,6 @@ QModelingElement *QUmlDeploymentTarget::clone() const QUmlDeploymentTarget *c = new QUmlDeploymentTarget; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumldeploymenttarget.h b/src/uml/qumldeploymenttarget.h index 5937dc8f..f16bea4d 100644 --- a/src/uml/qumldeploymenttarget.h +++ b/src/uml/qumldeploymenttarget.h @@ -55,6 +55,8 @@ class QUmlPackageableElement; class Q_UML_EXPORT QUmlDeploymentTarget : public virtual QUmlNamedElement { public: + virtual ~QUmlDeploymentTarget(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumldestroylinkaction.cpp b/src/uml/qumldestroylinkaction.cpp index 2e47de9d..c6f61f01 100644 --- a/src/uml/qumldestroylinkaction.cpp +++ b/src/uml/qumldestroylinkaction.cpp @@ -86,6 +86,14 @@ QUmlDestroyLinkAction::QUmlDestroyLinkAction(bool createQModelingObject) } /*! + Destroys the QUmlDestroyLinkAction. + */ +QUmlDestroyLinkAction::~QUmlDestroyLinkAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDestroyLinkAction. */ QModelingElement *QUmlDestroyLinkAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlDestroyLinkAction::clone() const QUmlDestroyLinkAction *c = new QUmlDestroyLinkAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumldestroylinkaction.h b/src/uml/qumldestroylinkaction.h index 861fded6..fbc05a02 100644 --- a/src/uml/qumldestroylinkaction.h +++ b/src/uml/qumldestroylinkaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlDestroyLinkAction : public QUmlWriteLinkAction { public: explicit QUmlDestroyLinkAction(bool createQModelingObject = true); + virtual ~QUmlDestroyLinkAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldestroyobjectaction.cpp b/src/uml/qumldestroyobjectaction.cpp index 7a294723..7e9ea780 100644 --- a/src/uml/qumldestroyobjectaction.cpp +++ b/src/uml/qumldestroyobjectaction.cpp @@ -86,6 +86,14 @@ QUmlDestroyObjectAction::QUmlDestroyObjectAction(bool createQModelingObject) : } /*! + Destroys the QUmlDestroyObjectAction. + */ +QUmlDestroyObjectAction::~QUmlDestroyObjectAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDestroyObjectAction. */ QModelingElement *QUmlDestroyObjectAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlDestroyObjectAction::clone() const QUmlDestroyObjectAction *c = new QUmlDestroyObjectAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumldestroyobjectaction.h b/src/uml/qumldestroyobjectaction.h index 2bdc594e..34880fd1 100644 --- a/src/uml/qumldestroyobjectaction.h +++ b/src/uml/qumldestroyobjectaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlDestroyObjectAction : public QUmlAction { public: explicit QUmlDestroyObjectAction(bool createQModelingObject = true); + virtual ~QUmlDestroyObjectAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldestructionoccurrencespecification.cpp b/src/uml/qumldestructionoccurrencespecification.cpp index 6174684c..87ef9fc9 100644 --- a/src/uml/qumldestructionoccurrencespecification.cpp +++ b/src/uml/qumldestructionoccurrencespecification.cpp @@ -76,6 +76,14 @@ QUmlDestructionOccurrenceSpecification::QUmlDestructionOccurrenceSpecification(b } /*! + Destroys the QUmlDestructionOccurrenceSpecification. + */ +QUmlDestructionOccurrenceSpecification::~QUmlDestructionOccurrenceSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDestructionOccurrenceSpecification. */ QModelingElement *QUmlDestructionOccurrenceSpecification::clone() const @@ -83,26 +91,12 @@ QModelingElement *QUmlDestructionOccurrenceSpecification::clone() const QUmlDestructionOccurrenceSpecification *c = new QUmlDestructionOccurrenceSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (covered()) - c->setCovered(dynamic_cast<QUmlLifeline *>(covered()->clone())); - foreach (QUmlGeneralOrdering *element, toAfters()) - c->addToAfter(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - foreach (QUmlGeneralOrdering *element, toBefores()) - c->addToBefore(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (message()) - c->setMessage(dynamic_cast<QUmlMessage *>(message()->clone())); return c; } diff --git a/src/uml/qumldestructionoccurrencespecification.h b/src/uml/qumldestructionoccurrencespecification.h index 59fecfc8..1e13f714 100644 --- a/src/uml/qumldestructionoccurrencespecification.h +++ b/src/uml/qumldestructionoccurrencespecification.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlDestructionOccurrenceSpecification : public QUmlMessageOc { public: explicit QUmlDestructionOccurrenceSpecification(bool createQModelingObject = true); + virtual ~QUmlDestructionOccurrenceSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldevice.cpp b/src/uml/qumldevice.cpp index a6869a40..7c32fd25 100644 --- a/src/uml/qumldevice.cpp +++ b/src/uml/qumldevice.cpp @@ -101,6 +101,14 @@ QUmlDevice::QUmlDevice(bool createQModelingObject) : } /*! + Destroys the QUmlDevice. + */ +QUmlDevice::~QUmlDevice() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDevice. */ QModelingElement *QUmlDevice::clone() const @@ -108,8 +116,6 @@ QModelingElement *QUmlDevice::clone() const QUmlDevice *c = new QUmlDevice; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -119,11 +125,7 @@ QModelingElement *QUmlDevice::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -136,22 +138,10 @@ QModelingElement *QUmlDevice::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumldevice.h b/src/uml/qumldevice.h index 58f84cc6..f80b7681 100644 --- a/src/uml/qumldevice.h +++ b/src/uml/qumldevice.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlDevice : public QUmlNode { public: explicit QUmlDevice(bool createQModelingObject = true); + virtual ~QUmlDevice(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldirectedrelationship.cpp b/src/uml/qumldirectedrelationship.cpp index 419b34aa..55b2f628 100644 --- a/src/uml/qumldirectedrelationship.cpp +++ b/src/uml/qumldirectedrelationship.cpp @@ -63,6 +63,14 @@ QUmlDirectedRelationship::QUmlDirectedRelationship() } /*! + Destroys the QUmlDirectedRelationship. + */ +QUmlDirectedRelationship::~QUmlDirectedRelationship() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDirectedRelationship. */ QModelingElement *QUmlDirectedRelationship::clone() const diff --git a/src/uml/qumldirectedrelationship.h b/src/uml/qumldirectedrelationship.h index d67e4c4d..83c9074b 100644 --- a/src/uml/qumldirectedrelationship.h +++ b/src/uml/qumldirectedrelationship.h @@ -54,6 +54,8 @@ class QUmlElement; class Q_UML_EXPORT QUmlDirectedRelationship : public QUmlRelationship { public: + virtual ~QUmlDirectedRelationship(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlduration.cpp b/src/uml/qumlduration.cpp index f44e7386..bcaa563b 100644 --- a/src/uml/qumlduration.cpp +++ b/src/uml/qumlduration.cpp @@ -75,6 +75,14 @@ QUmlDuration::QUmlDuration(bool createQModelingObject) : } /*! + Destroys the QUmlDuration. + */ +QUmlDuration::~QUmlDuration() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDuration. */ QModelingElement *QUmlDuration::clone() const @@ -82,22 +90,12 @@ QModelingElement *QUmlDuration::clone() const QUmlDuration *c = new QUmlDuration; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); if (expr()) c->setExpr(dynamic_cast<QUmlValueSpecification *>(expr()->clone())); - foreach (QUmlObservation *element, observations()) - c->addObservation(dynamic_cast<QUmlObservation *>(element->clone())); return c; } diff --git a/src/uml/qumlduration.h b/src/uml/qumlduration.h index 9e4a778a..123cc44d 100644 --- a/src/uml/qumlduration.h +++ b/src/uml/qumlduration.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlDuration : public QUmlValueSpecification { public: explicit QUmlDuration(bool createQModelingObject = true); + virtual ~QUmlDuration(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldurationconstraint.cpp b/src/uml/qumldurationconstraint.cpp index c0c7852f..a3a3f76d 100644 --- a/src/uml/qumldurationconstraint.cpp +++ b/src/uml/qumldurationconstraint.cpp @@ -77,6 +77,14 @@ QUmlDurationConstraint::QUmlDurationConstraint(bool createQModelingObject) : } /*! + Destroys the QUmlDurationConstraint. + */ +QUmlDurationConstraint::~QUmlDurationConstraint() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDurationConstraint. */ QModelingElement *QUmlDurationConstraint::clone() const @@ -84,20 +92,10 @@ QModelingElement *QUmlDurationConstraint::clone() const QUmlDurationConstraint *c = new QUmlDurationConstraint; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlElement *element, constrainedElements()) - c->addConstrainedElement(dynamic_cast<QUmlElement *>(element->clone())); - if (context()) - c->setContext(dynamic_cast<QUmlNamespace *>(context()->clone())); c->setFirstEvent(firstEvent()); if (specification()) c->setSpecification(dynamic_cast<QUmlDurationInterval *>(specification()->clone())); diff --git a/src/uml/qumldurationconstraint.h b/src/uml/qumldurationconstraint.h index 70ad9b3e..b5bfb7b7 100644 --- a/src/uml/qumldurationconstraint.h +++ b/src/uml/qumldurationconstraint.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlDurationConstraint : public QUmlIntervalConstraint { public: explicit QUmlDurationConstraint(bool createQModelingObject = true); + virtual ~QUmlDurationConstraint(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldurationinterval.cpp b/src/uml/qumldurationinterval.cpp index 17b00a89..735806cd 100644 --- a/src/uml/qumldurationinterval.cpp +++ b/src/uml/qumldurationinterval.cpp @@ -78,6 +78,14 @@ QUmlDurationInterval::QUmlDurationInterval(bool createQModelingObject) : } /*! + Destroys the QUmlDurationInterval. + */ +QUmlDurationInterval::~QUmlDurationInterval() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDurationInterval. */ QModelingElement *QUmlDurationInterval::clone() const @@ -85,22 +93,10 @@ QModelingElement *QUmlDurationInterval::clone() const QUmlDurationInterval *c = new QUmlDurationInterval; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); - if (max()) - c->setMax(dynamic_cast<QUmlDuration *>(max()->clone())); - if (min()) - c->setMin(dynamic_cast<QUmlDuration *>(min()->clone())); return c; } diff --git a/src/uml/qumldurationinterval.h b/src/uml/qumldurationinterval.h index c5a5a64f..19bb0e38 100644 --- a/src/uml/qumldurationinterval.h +++ b/src/uml/qumldurationinterval.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlDurationInterval : public QUmlInterval { public: explicit QUmlDurationInterval(bool createQModelingObject = true); + virtual ~QUmlDurationInterval(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumldurationobservation.cpp b/src/uml/qumldurationobservation.cpp index a2c36b4c..1d5ac35f 100644 --- a/src/uml/qumldurationobservation.cpp +++ b/src/uml/qumldurationobservation.cpp @@ -73,6 +73,14 @@ QUmlDurationObservation::QUmlDurationObservation(bool createQModelingObject) : } /*! + Destroys the QUmlDurationObservation. + */ +QUmlDurationObservation::~QUmlDurationObservation() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlDurationObservation. */ QModelingElement *QUmlDurationObservation::clone() const @@ -80,18 +88,10 @@ QModelingElement *QUmlDurationObservation::clone() const QUmlDurationObservation *c = new QUmlDurationObservation; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (event_()) - c->setEvent(dynamic_cast<QUmlNamedElement *>(event_()->clone())); c->setFirstEvent(firstEvent()); return c; } diff --git a/src/uml/qumldurationobservation.h b/src/uml/qumldurationobservation.h index f8310c5c..1b86c456 100644 --- a/src/uml/qumldurationobservation.h +++ b/src/uml/qumldurationobservation.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlDurationObservation : public QUmlObservation { public: explicit QUmlDurationObservation(bool createQModelingObject = true); + virtual ~QUmlDurationObservation(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlelement.cpp b/src/uml/qumlelement.cpp index e26f1500..44651bba 100644 --- a/src/uml/qumlelement.cpp +++ b/src/uml/qumlelement.cpp @@ -63,6 +63,14 @@ QUmlElement::QUmlElement() : } /*! + Destroys the QUmlElement. + */ +QUmlElement::~QUmlElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlElement. */ QModelingElement *QUmlElement::clone() const diff --git a/src/uml/qumlelement.h b/src/uml/qumlelement.h index 5c3ed8be..6b97571a 100644 --- a/src/uml/qumlelement.h +++ b/src/uml/qumlelement.h @@ -54,6 +54,8 @@ class QUmlComment; class Q_UML_EXPORT QUmlElement : public QModelingElement { public: + virtual ~QUmlElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlelementimport.cpp b/src/uml/qumlelementimport.cpp index 55149b03..1fb7efd8 100644 --- a/src/uml/qumlelementimport.cpp +++ b/src/uml/qumlelementimport.cpp @@ -70,6 +70,14 @@ QUmlElementImport::QUmlElementImport(bool createQModelingObject) : } /*! + Destroys the QUmlElementImport. + */ +QUmlElementImport::~QUmlElementImport() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlElementImport. */ QModelingElement *QUmlElementImport::clone() const @@ -78,10 +86,6 @@ QModelingElement *QUmlElementImport::clone() const foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); c->setAlias(alias()); - if (importedElement()) - c->setImportedElement(dynamic_cast<QUmlPackageableElement *>(importedElement()->clone())); - if (importingNamespace()) - c->setImportingNamespace(dynamic_cast<QUmlNamespace *>(importingNamespace()->clone())); c->setVisibility(visibility()); return c; } diff --git a/src/uml/qumlelementimport.h b/src/uml/qumlelementimport.h index c056f51d..d7fac30d 100644 --- a/src/uml/qumlelementimport.h +++ b/src/uml/qumlelementimport.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlElementImport : public QUmlDirectedRelationship { public: explicit QUmlElementImport(bool createQModelingObject = true); + virtual ~QUmlElementImport(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlencapsulatedclassifier.cpp b/src/uml/qumlencapsulatedclassifier.cpp index b281380d..f84af8da 100644 --- a/src/uml/qumlencapsulatedclassifier.cpp +++ b/src/uml/qumlencapsulatedclassifier.cpp @@ -91,6 +91,14 @@ QUmlEncapsulatedClassifier::QUmlEncapsulatedClassifier() } /*! + Destroys the QUmlEncapsulatedClassifier. + */ +QUmlEncapsulatedClassifier::~QUmlEncapsulatedClassifier() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlEncapsulatedClassifier. */ QModelingElement *QUmlEncapsulatedClassifier::clone() const @@ -98,8 +106,6 @@ QModelingElement *QUmlEncapsulatedClassifier::clone() const QUmlEncapsulatedClassifier *c = new QUmlEncapsulatedClassifier; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -109,11 +115,7 @@ QModelingElement *QUmlEncapsulatedClassifier::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -127,18 +129,8 @@ QModelingElement *QUmlEncapsulatedClassifier::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) diff --git a/src/uml/qumlencapsulatedclassifier.h b/src/uml/qumlencapsulatedclassifier.h index 697f636d..4dfd212e 100644 --- a/src/uml/qumlencapsulatedclassifier.h +++ b/src/uml/qumlencapsulatedclassifier.h @@ -54,6 +54,8 @@ class QUmlPort; class Q_UML_EXPORT QUmlEncapsulatedClassifier : public QUmlStructuredClassifier { public: + virtual ~QUmlEncapsulatedClassifier(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlenumeration.cpp b/src/uml/qumlenumeration.cpp index b6544a4e..033491a9 100644 --- a/src/uml/qumlenumeration.cpp +++ b/src/uml/qumlenumeration.cpp @@ -93,6 +93,14 @@ QUmlEnumeration::QUmlEnumeration(bool createQModelingObject) : } /*! + Destroys the QUmlEnumeration. + */ +QUmlEnumeration::~QUmlEnumeration() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlEnumeration. */ QModelingElement *QUmlEnumeration::clone() const @@ -100,8 +108,6 @@ QModelingElement *QUmlEnumeration::clone() const QUmlEnumeration *c = new QUmlEnumeration; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -111,11 +117,7 @@ QModelingElement *QUmlEnumeration::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -129,18 +131,8 @@ QModelingElement *QUmlEnumeration::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlOperation *element, ownedOperations()) diff --git a/src/uml/qumlenumeration.h b/src/uml/qumlenumeration.h index 841219ba..12a8dc6d 100644 --- a/src/uml/qumlenumeration.h +++ b/src/uml/qumlenumeration.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlEnumeration : public QUmlDataType { public: explicit QUmlEnumeration(bool createQModelingObject = true); + virtual ~QUmlEnumeration(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlenumerationliteral.cpp b/src/uml/qumlenumerationliteral.cpp index 4d5c9ac9..a81a85ee 100644 --- a/src/uml/qumlenumerationliteral.cpp +++ b/src/uml/qumlenumerationliteral.cpp @@ -80,6 +80,14 @@ QUmlEnumerationLiteral::QUmlEnumerationLiteral(bool createQModelingObject) : } /*! + Destroys the QUmlEnumerationLiteral. + */ +QUmlEnumerationLiteral::~QUmlEnumerationLiteral() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlEnumerationLiteral. */ QModelingElement *QUmlEnumerationLiteral::clone() const @@ -87,15 +95,9 @@ QModelingElement *QUmlEnumerationLiteral::clone() const QUmlEnumerationLiteral *c = new QUmlEnumerationLiteral; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); foreach (QUmlDeployment *element, deployments()) c->addDeployment(dynamic_cast<QUmlDeployment *>(element->clone())); @@ -103,8 +105,6 @@ QModelingElement *QUmlEnumerationLiteral::clone() const c->addSlot(dynamic_cast<QUmlSlot *>(element->clone())); if (specification()) c->setSpecification(dynamic_cast<QUmlValueSpecification *>(specification()->clone())); - if (enumeration()) - c->setEnumeration(dynamic_cast<QUmlEnumeration *>(enumeration()->clone())); return c; } diff --git a/src/uml/qumlenumerationliteral.h b/src/uml/qumlenumerationliteral.h index 981c0d12..6c7ddb9e 100644 --- a/src/uml/qumlenumerationliteral.h +++ b/src/uml/qumlenumerationliteral.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlEnumerationLiteral : public QUmlInstanceSpecification { public: explicit QUmlEnumerationLiteral(bool createQModelingObject = true); + virtual ~QUmlEnumerationLiteral(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlevent.cpp b/src/uml/qumlevent.cpp index 094c3719..6ed4c311 100644 --- a/src/uml/qumlevent.cpp +++ b/src/uml/qumlevent.cpp @@ -70,6 +70,14 @@ QUmlEvent::QUmlEvent() } /*! + Destroys the QUmlEvent. + */ +QUmlEvent::~QUmlEvent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlEvent. */ QModelingElement *QUmlEvent::clone() const @@ -77,12 +85,6 @@ QModelingElement *QUmlEvent::clone() const QUmlEvent *c = new QUmlEvent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlevent.h b/src/uml/qumlevent.h index a5e7c1e6..501f0765 100644 --- a/src/uml/qumlevent.h +++ b/src/uml/qumlevent.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlEvent : public QUmlPackageableElement { public: + virtual ~QUmlEvent(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlexceptionhandler.cpp b/src/uml/qumlexceptionhandler.cpp index c4905d4e..ef39714a 100644 --- a/src/uml/qumlexceptionhandler.cpp +++ b/src/uml/qumlexceptionhandler.cpp @@ -70,6 +70,14 @@ QUmlExceptionHandler::QUmlExceptionHandler(bool createQModelingObject) : } /*! + Destroys the QUmlExceptionHandler. + */ +QUmlExceptionHandler::~QUmlExceptionHandler() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExceptionHandler. */ QModelingElement *QUmlExceptionHandler::clone() const @@ -77,14 +85,6 @@ QModelingElement *QUmlExceptionHandler::clone() const QUmlExceptionHandler *c = new QUmlExceptionHandler; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (exceptionInput()) - c->setExceptionInput(dynamic_cast<QUmlObjectNode *>(exceptionInput()->clone())); - foreach (QUmlClassifier *element, exceptionTypes()) - c->addExceptionType(dynamic_cast<QUmlClassifier *>(element->clone())); - if (handlerBody()) - c->setHandlerBody(dynamic_cast<QUmlExecutableNode *>(handlerBody()->clone())); - if (protectedNode()) - c->setProtectedNode(dynamic_cast<QUmlExecutableNode *>(protectedNode()->clone())); return c; } diff --git a/src/uml/qumlexceptionhandler.h b/src/uml/qumlexceptionhandler.h index 7e5e9bbc..635ca9ee 100644 --- a/src/uml/qumlexceptionhandler.h +++ b/src/uml/qumlexceptionhandler.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlExceptionHandler : public QUmlElement { public: explicit QUmlExceptionHandler(bool createQModelingObject = true); + virtual ~QUmlExceptionHandler(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlexecutablenode.cpp b/src/uml/qumlexecutablenode.cpp index 26c2b30f..e013bc22 100644 --- a/src/uml/qumlexecutablenode.cpp +++ b/src/uml/qumlexecutablenode.cpp @@ -77,6 +77,14 @@ QUmlExecutableNode::QUmlExecutableNode() } /*! + Destroys the QUmlExecutableNode. + */ +QUmlExecutableNode::~QUmlExecutableNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExecutableNode. */ QModelingElement *QUmlExecutableNode::clone() const @@ -84,27 +92,11 @@ QModelingElement *QUmlExecutableNode::clone() const QUmlExecutableNode *c = new QUmlExecutableNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); return c; diff --git a/src/uml/qumlexecutablenode.h b/src/uml/qumlexecutablenode.h index 5e404879..8273eec6 100644 --- a/src/uml/qumlexecutablenode.h +++ b/src/uml/qumlexecutablenode.h @@ -54,6 +54,8 @@ class QUmlExceptionHandler; class Q_UML_EXPORT QUmlExecutableNode : public QUmlActivityNode { public: + virtual ~QUmlExecutableNode(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlexecutionenvironment.cpp b/src/uml/qumlexecutionenvironment.cpp index 546437ad..98cca5a1 100644 --- a/src/uml/qumlexecutionenvironment.cpp +++ b/src/uml/qumlexecutionenvironment.cpp @@ -101,6 +101,14 @@ QUmlExecutionEnvironment::QUmlExecutionEnvironment(bool createQModelingObject) : } /*! + Destroys the QUmlExecutionEnvironment. + */ +QUmlExecutionEnvironment::~QUmlExecutionEnvironment() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExecutionEnvironment. */ QModelingElement *QUmlExecutionEnvironment::clone() const @@ -108,8 +116,6 @@ QModelingElement *QUmlExecutionEnvironment::clone() const QUmlExecutionEnvironment *c = new QUmlExecutionEnvironment; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -119,11 +125,7 @@ QModelingElement *QUmlExecutionEnvironment::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -136,22 +138,10 @@ QModelingElement *QUmlExecutionEnvironment::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumlexecutionenvironment.h b/src/uml/qumlexecutionenvironment.h index cd0553c0..35a44e36 100644 --- a/src/uml/qumlexecutionenvironment.h +++ b/src/uml/qumlexecutionenvironment.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlExecutionEnvironment : public QUmlNode { public: explicit QUmlExecutionEnvironment(bool createQModelingObject = true); + virtual ~QUmlExecutionEnvironment(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlexecutionoccurrencespecification.cpp b/src/uml/qumlexecutionoccurrencespecification.cpp index c785c50b..521847f9 100644 --- a/src/uml/qumlexecutionoccurrencespecification.cpp +++ b/src/uml/qumlexecutionoccurrencespecification.cpp @@ -77,6 +77,14 @@ QUmlExecutionOccurrenceSpecification::QUmlExecutionOccurrenceSpecification(bool } /*! + Destroys the QUmlExecutionOccurrenceSpecification. + */ +QUmlExecutionOccurrenceSpecification::~QUmlExecutionOccurrenceSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExecutionOccurrenceSpecification. */ QModelingElement *QUmlExecutionOccurrenceSpecification::clone() const @@ -84,26 +92,12 @@ QModelingElement *QUmlExecutionOccurrenceSpecification::clone() const QUmlExecutionOccurrenceSpecification *c = new QUmlExecutionOccurrenceSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (covered()) - c->setCovered(dynamic_cast<QUmlLifeline *>(covered()->clone())); - foreach (QUmlGeneralOrdering *element, toAfters()) - c->addToAfter(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - foreach (QUmlGeneralOrdering *element, toBefores()) - c->addToBefore(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (execution()) - c->setExecution(dynamic_cast<QUmlExecutionSpecification *>(execution()->clone())); return c; } diff --git a/src/uml/qumlexecutionoccurrencespecification.h b/src/uml/qumlexecutionoccurrencespecification.h index bc1cc8b1..969421cb 100644 --- a/src/uml/qumlexecutionoccurrencespecification.h +++ b/src/uml/qumlexecutionoccurrencespecification.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlExecutionOccurrenceSpecification : public QUmlOccurrenceS { public: explicit QUmlExecutionOccurrenceSpecification(bool createQModelingObject = true); + virtual ~QUmlExecutionOccurrenceSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlexecutionspecification.cpp b/src/uml/qumlexecutionspecification.cpp index 8739fdae..6c84e7d3 100644 --- a/src/uml/qumlexecutionspecification.cpp +++ b/src/uml/qumlexecutionspecification.cpp @@ -75,6 +75,14 @@ QUmlExecutionSpecification::QUmlExecutionSpecification() : } /*! + Destroys the QUmlExecutionSpecification. + */ +QUmlExecutionSpecification::~QUmlExecutionSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExecutionSpecification. */ QModelingElement *QUmlExecutionSpecification::clone() const @@ -82,24 +90,12 @@ QModelingElement *QUmlExecutionSpecification::clone() const QUmlExecutionSpecification *c = new QUmlExecutionSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (finish()) - c->setFinish(dynamic_cast<QUmlOccurrenceSpecification *>(finish()->clone())); - if (start()) - c->setStart(dynamic_cast<QUmlOccurrenceSpecification *>(start()->clone())); return c; } diff --git a/src/uml/qumlexecutionspecification.h b/src/uml/qumlexecutionspecification.h index 81a9bbcc..f566a942 100644 --- a/src/uml/qumlexecutionspecification.h +++ b/src/uml/qumlexecutionspecification.h @@ -54,6 +54,8 @@ class QUmlOccurrenceSpecification; class Q_UML_EXPORT QUmlExecutionSpecification : public QUmlInteractionFragment { public: + virtual ~QUmlExecutionSpecification(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlexpansionnode.cpp b/src/uml/qumlexpansionnode.cpp index bcb0add4..c957f81d 100644 --- a/src/uml/qumlexpansionnode.cpp +++ b/src/uml/qumlexpansionnode.cpp @@ -86,6 +86,14 @@ QUmlExpansionNode::QUmlExpansionNode(bool createQModelingObject) : } /*! + Destroys the QUmlExpansionNode. + */ +QUmlExpansionNode::~QUmlExpansionNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExpansionNode. */ QModelingElement *QUmlExpansionNode::clone() const @@ -93,41 +101,15 @@ QModelingElement *QUmlExpansionNode::clone() const QUmlExpansionNode *c = new QUmlExpansionNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); - if (regionAsInput()) - c->setRegionAsInput(dynamic_cast<QUmlExpansionRegion *>(regionAsInput()->clone())); - if (regionAsOutput()) - c->setRegionAsOutput(dynamic_cast<QUmlExpansionRegion *>(regionAsOutput()->clone())); return c; } diff --git a/src/uml/qumlexpansionnode.h b/src/uml/qumlexpansionnode.h index 5f0daeea..2139ffb5 100644 --- a/src/uml/qumlexpansionnode.h +++ b/src/uml/qumlexpansionnode.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlExpansionNode : public QUmlObjectNode { public: explicit QUmlExpansionNode(bool createQModelingObject = true); + virtual ~QUmlExpansionNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlexpansionregion.cpp b/src/uml/qumlexpansionregion.cpp index 9c0e1e71..88c1e848 100644 --- a/src/uml/qumlexpansionregion.cpp +++ b/src/uml/qumlexpansionregion.cpp @@ -89,6 +89,14 @@ QUmlExpansionRegion::QUmlExpansionRegion(bool createQModelingObject) : } /*! + Destroys the QUmlExpansionRegion. + */ +QUmlExpansionRegion::~QUmlExpansionRegion() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExpansionRegion. */ QModelingElement *QUmlExpansionRegion::clone() const @@ -96,25 +104,11 @@ QModelingElement *QUmlExpansionRegion::clone() const QUmlExpansionRegion *c = new QUmlExpansionRegion; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -128,8 +122,6 @@ QModelingElement *QUmlExpansionRegion::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); foreach (QUmlActivityEdge *element, edges()) c->addEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); c->setMustIsolate(mustIsolate()); @@ -141,11 +133,7 @@ QModelingElement *QUmlExpansionRegion::clone() const c->addStructuredNodeOutput(dynamic_cast<QUmlOutputPin *>(element->clone())); foreach (QUmlVariable *element, variables()) c->addVariable(dynamic_cast<QUmlVariable *>(element->clone())); - foreach (QUmlExpansionNode *element, inputElements()) - c->addInputElement(dynamic_cast<QUmlExpansionNode *>(element->clone())); c->setMode(mode()); - foreach (QUmlExpansionNode *element, outputElements()) - c->addOutputElement(dynamic_cast<QUmlExpansionNode *>(element->clone())); return c; } diff --git a/src/uml/qumlexpansionregion.h b/src/uml/qumlexpansionregion.h index d28e7ce1..fcf43a52 100644 --- a/src/uml/qumlexpansionregion.h +++ b/src/uml/qumlexpansionregion.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlExpansionRegion : public QUmlStructuredActivityNode { public: explicit QUmlExpansionRegion(bool createQModelingObject = true); + virtual ~QUmlExpansionRegion(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlexpression.cpp b/src/uml/qumlexpression.cpp index ff95a117..2863ea60 100644 --- a/src/uml/qumlexpression.cpp +++ b/src/uml/qumlexpression.cpp @@ -73,6 +73,14 @@ QUmlExpression::QUmlExpression(bool createQModelingObject) } /*! + Destroys the QUmlExpression. + */ +QUmlExpression::~QUmlExpression() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExpression. */ QModelingElement *QUmlExpression::clone() const @@ -80,17 +88,9 @@ QModelingElement *QUmlExpression::clone() const QUmlExpression *c = new QUmlExpression; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); foreach (QUmlValueSpecification *element, operands()) c->addOperand(dynamic_cast<QUmlValueSpecification *>(element->clone())); diff --git a/src/uml/qumlexpression.h b/src/uml/qumlexpression.h index c233bdac..73d6f712 100644 --- a/src/uml/qumlexpression.h +++ b/src/uml/qumlexpression.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlExpression : public QUmlValueSpecification { public: explicit QUmlExpression(bool createQModelingObject = true); + virtual ~QUmlExpression(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlextend.cpp b/src/uml/qumlextend.cpp index edf13863..9d6a5411 100644 --- a/src/uml/qumlextend.cpp +++ b/src/uml/qumlextend.cpp @@ -75,6 +75,14 @@ QUmlExtend::QUmlExtend(bool createQModelingObject) : } /*! + Destroys the QUmlExtend. + */ +QUmlExtend::~QUmlExtend() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExtend. */ QModelingElement *QUmlExtend::clone() const @@ -82,20 +90,12 @@ QModelingElement *QUmlExtend::clone() const QUmlExtend *c = new QUmlExtend; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); if (condition()) c->setCondition(dynamic_cast<QUmlConstraint *>(condition()->clone())); - if (extendedCase()) - c->setExtendedCase(dynamic_cast<QUmlUseCase *>(extendedCase()->clone())); - if (extension()) - c->setExtension(dynamic_cast<QUmlUseCase *>(extension()->clone())); - foreach (QUmlExtensionPoint *element, extensionLocations()) - c->addExtensionLocation(dynamic_cast<QUmlExtensionPoint *>(element->clone())); return c; } diff --git a/src/uml/qumlextend.h b/src/uml/qumlextend.h index 49562f86..3781b335 100644 --- a/src/uml/qumlextend.h +++ b/src/uml/qumlextend.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlExtend : public QUmlDirectedRelationship, public QUmlName { public: explicit QUmlExtend(bool createQModelingObject = true); + virtual ~QUmlExtend(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlextension.cpp b/src/uml/qumlextension.cpp index 3c70a1d4..2958b5cd 100644 --- a/src/uml/qumlextension.cpp +++ b/src/uml/qumlextension.cpp @@ -94,6 +94,14 @@ QUmlExtension::QUmlExtension(bool createQModelingObject) : } /*! + Destroys the QUmlExtension. + */ +QUmlExtension::~QUmlExtension() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExtension. */ QModelingElement *QUmlExtension::clone() const @@ -101,8 +109,6 @@ QModelingElement *QUmlExtension::clone() const QUmlExtension *c = new QUmlExtension; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -112,11 +118,7 @@ QModelingElement *QUmlExtension::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -130,23 +132,9 @@ QModelingElement *QUmlExtension::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); c->setDerived(isDerived()); - foreach (QUmlProperty *element, memberEnds()) - c->addMemberEnd(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, navigableOwnedEnds()) - c->addNavigableOwnedEnd(dynamic_cast<QUmlProperty *>(element->clone())); if (ownedEnd()) c->setOwnedEnd(dynamic_cast<QUmlExtensionEnd *>(ownedEnd()->clone())); return c; diff --git a/src/uml/qumlextension.h b/src/uml/qumlextension.h index 985e7ca1..2403a5c0 100644 --- a/src/uml/qumlextension.h +++ b/src/uml/qumlextension.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlExtension : public QUmlAssociation { public: explicit QUmlExtension(bool createQModelingObject = true); + virtual ~QUmlExtension(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlextensionend.cpp b/src/uml/qumlextensionend.cpp index 0544957b..15baae1a 100644 --- a/src/uml/qumlextensionend.cpp +++ b/src/uml/qumlextensionend.cpp @@ -88,6 +88,14 @@ QUmlExtensionEnd::QUmlExtensionEnd(bool createQModelingObject) : } /*! + Destroys the QUmlExtensionEnd. + */ +QUmlExtensionEnd::~QUmlExtensionEnd() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExtensionEnd. */ QModelingElement *QUmlExtensionEnd::clone() const @@ -95,8 +103,6 @@ QModelingElement *QUmlExtensionEnd::clone() const QUmlExtensionEnd *c = new QUmlExtensionEnd; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -109,39 +115,17 @@ QModelingElement *QUmlExtensionEnd::clone() const c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); c->setLeaf(isLeaf()); c->setStatic(isStatic()); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlConnectableElementTemplateParameter *>(templateParameter()->clone())); foreach (QUmlDeployment *element, deployments()) c->addDeployment(dynamic_cast<QUmlDeployment *>(element->clone())); c->setAggregation(aggregation()); - if (association()) - c->setAssociation(dynamic_cast<QUmlAssociation *>(association()->clone())); - if (associationEnd()) - c->setAssociationEnd(dynamic_cast<QUmlProperty *>(associationEnd()->clone())); - if (class_()) - c->setClass(dynamic_cast<QUmlClass *>(class_()->clone())); - if (datatype()) - c->setDatatype(dynamic_cast<QUmlDataType *>(datatype()->clone())); if (defaultValue()) c->setDefaultValue(dynamic_cast<QUmlValueSpecification *>(defaultValue()->clone())); - if (interface_()) - c->setInterface(dynamic_cast<QUmlInterface *>(interface_()->clone())); c->setDerived(isDerived()); c->setDerivedUnion(isDerivedUnion()); c->setID(isID()); c->setReadOnly(isReadOnly()); - if (owningAssociation()) - c->setOwningAssociation(dynamic_cast<QUmlAssociation *>(owningAssociation()->clone())); foreach (QUmlProperty *element, qualifiers()) c->addQualifier(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, redefinedProperties()) - c->addRedefinedProperty(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, subsettedProperties()) - c->addSubsettedProperty(dynamic_cast<QUmlProperty *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlStereotype *>(type()->clone())); return c; } diff --git a/src/uml/qumlextensionend.h b/src/uml/qumlextensionend.h index 439eadb0..ece9e6f6 100644 --- a/src/uml/qumlextensionend.h +++ b/src/uml/qumlextensionend.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlExtensionEnd : public QUmlProperty { public: explicit QUmlExtensionEnd(bool createQModelingObject = true); + virtual ~QUmlExtensionEnd(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlextensionpoint.cpp b/src/uml/qumlextensionpoint.cpp index dca6d648..4f4a6a44 100644 --- a/src/uml/qumlextensionpoint.cpp +++ b/src/uml/qumlextensionpoint.cpp @@ -73,6 +73,14 @@ QUmlExtensionPoint::QUmlExtensionPoint(bool createQModelingObject) : } /*! + Destroys the QUmlExtensionPoint. + */ +QUmlExtensionPoint::~QUmlExtensionPoint() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlExtensionPoint. */ QModelingElement *QUmlExtensionPoint::clone() const @@ -80,15 +88,11 @@ QModelingElement *QUmlExtensionPoint::clone() const QUmlExtensionPoint *c = new QUmlExtensionPoint; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (useCase()) - c->setUseCase(dynamic_cast<QUmlUseCase *>(useCase()->clone())); return c; } diff --git a/src/uml/qumlextensionpoint.h b/src/uml/qumlextensionpoint.h index ffc424b7..094c314a 100644 --- a/src/uml/qumlextensionpoint.h +++ b/src/uml/qumlextensionpoint.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlExtensionPoint : public QUmlRedefinableElement { public: explicit QUmlExtensionPoint(bool createQModelingObject = true); + virtual ~QUmlExtensionPoint(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlfeature.cpp b/src/uml/qumlfeature.cpp index 811192da..c80ac95d 100644 --- a/src/uml/qumlfeature.cpp +++ b/src/uml/qumlfeature.cpp @@ -70,6 +70,14 @@ QUmlFeature::QUmlFeature() : } /*! + Destroys the QUmlFeature. + */ +QUmlFeature::~QUmlFeature() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlFeature. */ QModelingElement *QUmlFeature::clone() const @@ -77,8 +85,6 @@ QModelingElement *QUmlFeature::clone() const QUmlFeature *c = new QUmlFeature; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlfeature.h b/src/uml/qumlfeature.h index 7b7123f2..302257cb 100644 --- a/src/uml/qumlfeature.h +++ b/src/uml/qumlfeature.h @@ -54,6 +54,8 @@ class QUmlClassifier; class Q_UML_EXPORT QUmlFeature : public QUmlRedefinableElement { public: + virtual ~QUmlFeature(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlfinalnode.cpp b/src/uml/qumlfinalnode.cpp index 0e741ae8..9207a788 100644 --- a/src/uml/qumlfinalnode.cpp +++ b/src/uml/qumlfinalnode.cpp @@ -77,6 +77,14 @@ QUmlFinalNode::QUmlFinalNode() } /*! + Destroys the QUmlFinalNode. + */ +QUmlFinalNode::~QUmlFinalNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlFinalNode. */ QModelingElement *QUmlFinalNode::clone() const @@ -84,27 +92,11 @@ QModelingElement *QUmlFinalNode::clone() const QUmlFinalNode *c = new QUmlFinalNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlfinalnode.h b/src/uml/qumlfinalnode.h index 7d3d8bc7..df549d29 100644 --- a/src/uml/qumlfinalnode.h +++ b/src/uml/qumlfinalnode.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlFinalNode : public QUmlControlNode { public: + virtual ~QUmlFinalNode(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlfinalstate.cpp b/src/uml/qumlfinalstate.cpp index b51d3512..7ada8332 100644 --- a/src/uml/qumlfinalstate.cpp +++ b/src/uml/qumlfinalstate.cpp @@ -84,6 +84,14 @@ QUmlFinalState::QUmlFinalState(bool createQModelingObject) : } /*! + Destroys the QUmlFinalState. + */ +QUmlFinalState::~QUmlFinalState() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlFinalState. */ QModelingElement *QUmlFinalState::clone() const @@ -91,8 +99,6 @@ QModelingElement *QUmlFinalState::clone() const QUmlFinalState *c = new QUmlFinalState; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -104,8 +110,6 @@ QModelingElement *QUmlFinalState::clone() const foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); c->setLeaf(isLeaf()); - if (container()) - c->setContainer(dynamic_cast<QUmlRegion *>(container()->clone())); foreach (QUmlConnectionPointReference *element, connections()) c->addConnection(dynamic_cast<QUmlConnectionPointReference *>(element->clone())); foreach (QUmlPseudostate *element, connectionPoints()) @@ -118,14 +122,10 @@ QModelingElement *QUmlFinalState::clone() const c->setEntry(dynamic_cast<QUmlBehavior *>(entry()->clone())); if (exit()) c->setExit(dynamic_cast<QUmlBehavior *>(exit()->clone())); - if (redefinedState()) - c->setRedefinedState(dynamic_cast<QUmlState *>(redefinedState()->clone())); foreach (QUmlRegion *element, regions()) c->addRegion(dynamic_cast<QUmlRegion *>(element->clone())); if (stateInvariant()) c->setStateInvariant(dynamic_cast<QUmlConstraint *>(stateInvariant()->clone())); - if (submachine()) - c->setSubmachine(dynamic_cast<QUmlStateMachine *>(submachine()->clone())); return c; } diff --git a/src/uml/qumlfinalstate.h b/src/uml/qumlfinalstate.h index 58e30db8..d777ed1f 100644 --- a/src/uml/qumlfinalstate.h +++ b/src/uml/qumlfinalstate.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlFinalState : public QUmlState { public: explicit QUmlFinalState(bool createQModelingObject = true); + virtual ~QUmlFinalState(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlflowfinalnode.cpp b/src/uml/qumlflowfinalnode.cpp index 018af087..2bfff382 100644 --- a/src/uml/qumlflowfinalnode.cpp +++ b/src/uml/qumlflowfinalnode.cpp @@ -79,6 +79,14 @@ QUmlFlowFinalNode::QUmlFlowFinalNode(bool createQModelingObject) } /*! + Destroys the QUmlFlowFinalNode. + */ +QUmlFlowFinalNode::~QUmlFlowFinalNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlFlowFinalNode. */ QModelingElement *QUmlFlowFinalNode::clone() const @@ -86,27 +94,11 @@ QModelingElement *QUmlFlowFinalNode::clone() const QUmlFlowFinalNode *c = new QUmlFlowFinalNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlflowfinalnode.h b/src/uml/qumlflowfinalnode.h index 5599f079..2ef01676 100644 --- a/src/uml/qumlflowfinalnode.h +++ b/src/uml/qumlflowfinalnode.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlFlowFinalNode : public QUmlFinalNode { public: explicit QUmlFlowFinalNode(bool createQModelingObject = true); + virtual ~QUmlFlowFinalNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlforknode.cpp b/src/uml/qumlforknode.cpp index aa889a61..b44b83d1 100644 --- a/src/uml/qumlforknode.cpp +++ b/src/uml/qumlforknode.cpp @@ -79,6 +79,14 @@ QUmlForkNode::QUmlForkNode(bool createQModelingObject) } /*! + Destroys the QUmlForkNode. + */ +QUmlForkNode::~QUmlForkNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlForkNode. */ QModelingElement *QUmlForkNode::clone() const @@ -86,27 +94,11 @@ QModelingElement *QUmlForkNode::clone() const QUmlForkNode *c = new QUmlForkNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlforknode.h b/src/uml/qumlforknode.h index de3e0b97..a2529dac 100644 --- a/src/uml/qumlforknode.h +++ b/src/uml/qumlforknode.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlForkNode : public QUmlControlNode { public: explicit QUmlForkNode(bool createQModelingObject = true); + virtual ~QUmlForkNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlfunctionbehavior.cpp b/src/uml/qumlfunctionbehavior.cpp index 2cc16403..52e3f672 100644 --- a/src/uml/qumlfunctionbehavior.cpp +++ b/src/uml/qumlfunctionbehavior.cpp @@ -104,6 +104,14 @@ QUmlFunctionBehavior::QUmlFunctionBehavior(bool createQModelingObject) : } /*! + Destroys the QUmlFunctionBehavior. + */ +QUmlFunctionBehavior::~QUmlFunctionBehavior() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlFunctionBehavior. */ QModelingElement *QUmlFunctionBehavior::clone() const @@ -111,8 +119,6 @@ QModelingElement *QUmlFunctionBehavior::clone() const QUmlFunctionBehavior *c = new QUmlFunctionBehavior; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -122,11 +128,7 @@ QModelingElement *QUmlFunctionBehavior::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -139,22 +141,10 @@ QModelingElement *QUmlFunctionBehavior::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -178,10 +168,6 @@ QModelingElement *QUmlFunctionBehavior::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - foreach (QUmlBehavior *element, redefinedBehaviors()) - c->addRedefinedBehavior(dynamic_cast<QUmlBehavior *>(element->clone())); - if (specification()) - c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone())); foreach (QString element, bodies()) c->addBody(element); foreach (QString element, languages()) diff --git a/src/uml/qumlfunctionbehavior.h b/src/uml/qumlfunctionbehavior.h index 973b4473..fb934c8f 100644 --- a/src/uml/qumlfunctionbehavior.h +++ b/src/uml/qumlfunctionbehavior.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlFunctionBehavior : public QUmlOpaqueBehavior { public: explicit QUmlFunctionBehavior(bool createQModelingObject = true); + virtual ~QUmlFunctionBehavior(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlgate.cpp b/src/uml/qumlgate.cpp index 051eed93..0fcde83a 100644 --- a/src/uml/qumlgate.cpp +++ b/src/uml/qumlgate.cpp @@ -71,6 +71,14 @@ QUmlGate::QUmlGate(bool createQModelingObject) } /*! + Destroys the QUmlGate. + */ +QUmlGate::~QUmlGate() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlGate. */ QModelingElement *QUmlGate::clone() const @@ -78,14 +86,10 @@ QModelingElement *QUmlGate::clone() const QUmlGate *c = new QUmlGate; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (message()) - c->setMessage(dynamic_cast<QUmlMessage *>(message()->clone())); return c; } diff --git a/src/uml/qumlgate.h b/src/uml/qumlgate.h index d02d6307..03a75962 100644 --- a/src/uml/qumlgate.h +++ b/src/uml/qumlgate.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlGate : public QUmlMessageEnd { public: explicit QUmlGate(bool createQModelingObject = true); + virtual ~QUmlGate(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlgeneralization.cpp b/src/uml/qumlgeneralization.cpp index d537587a..40e1bc0e 100644 --- a/src/uml/qumlgeneralization.cpp +++ b/src/uml/qumlgeneralization.cpp @@ -70,6 +70,14 @@ QUmlGeneralization::QUmlGeneralization(bool createQModelingObject) : } /*! + Destroys the QUmlGeneralization. + */ +QUmlGeneralization::~QUmlGeneralization() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlGeneralization. */ QModelingElement *QUmlGeneralization::clone() const @@ -77,13 +85,7 @@ QModelingElement *QUmlGeneralization::clone() const QUmlGeneralization *c = new QUmlGeneralization; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (general()) - c->setGeneral(dynamic_cast<QUmlClassifier *>(general()->clone())); - foreach (QUmlGeneralizationSet *element, generalizationSets()) - c->addGeneralizationSet(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); c->setSubstitutable(isSubstitutable()); - if (specific()) - c->setSpecific(dynamic_cast<QUmlClassifier *>(specific()->clone())); return c; } diff --git a/src/uml/qumlgeneralization.h b/src/uml/qumlgeneralization.h index 817355e8..4b1977ca 100644 --- a/src/uml/qumlgeneralization.h +++ b/src/uml/qumlgeneralization.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlGeneralization : public QUmlDirectedRelationship { public: explicit QUmlGeneralization(bool createQModelingObject = true); + virtual ~QUmlGeneralization(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlgeneralizationset.cpp b/src/uml/qumlgeneralizationset.cpp index 73d20e71..2a00b984 100644 --- a/src/uml/qumlgeneralizationset.cpp +++ b/src/uml/qumlgeneralizationset.cpp @@ -77,6 +77,14 @@ QUmlGeneralizationSet::QUmlGeneralizationSet(bool createQModelingObject) : } /*! + Destroys the QUmlGeneralizationSet. + */ +QUmlGeneralizationSet::~QUmlGeneralizationSet() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlGeneralizationSet. */ QModelingElement *QUmlGeneralizationSet::clone() const @@ -84,22 +92,12 @@ QModelingElement *QUmlGeneralizationSet::clone() const QUmlGeneralizationSet *c = new QUmlGeneralizationSet; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlGeneralization *element, generalizations()) - c->addGeneralization(dynamic_cast<QUmlGeneralization *>(element->clone())); c->setCovering(isCovering()); c->setDisjoint(isDisjoint()); - if (powertype()) - c->setPowertype(dynamic_cast<QUmlClassifier *>(powertype()->clone())); return c; } diff --git a/src/uml/qumlgeneralizationset.h b/src/uml/qumlgeneralizationset.h index 2772fb47..2de146cf 100644 --- a/src/uml/qumlgeneralizationset.h +++ b/src/uml/qumlgeneralizationset.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlGeneralizationSet : public QUmlPackageableElement { public: explicit QUmlGeneralizationSet(bool createQModelingObject = true); + virtual ~QUmlGeneralizationSet(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlgeneralordering.cpp b/src/uml/qumlgeneralordering.cpp index b35066e3..8152224e 100644 --- a/src/uml/qumlgeneralordering.cpp +++ b/src/uml/qumlgeneralordering.cpp @@ -72,6 +72,14 @@ QUmlGeneralOrdering::QUmlGeneralOrdering(bool createQModelingObject) : } /*! + Destroys the QUmlGeneralOrdering. + */ +QUmlGeneralOrdering::~QUmlGeneralOrdering() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlGeneralOrdering. */ QModelingElement *QUmlGeneralOrdering::clone() const @@ -79,16 +87,10 @@ QModelingElement *QUmlGeneralOrdering::clone() const QUmlGeneralOrdering *c = new QUmlGeneralOrdering; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (after()) - c->setAfter(dynamic_cast<QUmlOccurrenceSpecification *>(after()->clone())); - if (before()) - c->setBefore(dynamic_cast<QUmlOccurrenceSpecification *>(before()->clone())); return c; } diff --git a/src/uml/qumlgeneralordering.h b/src/uml/qumlgeneralordering.h index e3c320b9..315bfc03 100644 --- a/src/uml/qumlgeneralordering.h +++ b/src/uml/qumlgeneralordering.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlGeneralOrdering : public QUmlNamedElement { public: explicit QUmlGeneralOrdering(bool createQModelingObject = true); + virtual ~QUmlGeneralOrdering(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlimage.cpp b/src/uml/qumlimage.cpp index df6a4ae4..48c255ab 100644 --- a/src/uml/qumlimage.cpp +++ b/src/uml/qumlimage.cpp @@ -64,6 +64,14 @@ QUmlImage::QUmlImage(bool createQModelingObject) } /*! + Destroys the QUmlImage. + */ +QUmlImage::~QUmlImage() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlImage. */ QModelingElement *QUmlImage::clone() const diff --git a/src/uml/qumlimage.h b/src/uml/qumlimage.h index 2606b4c4..4364c8c2 100644 --- a/src/uml/qumlimage.h +++ b/src/uml/qumlimage.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlImage : public QUmlElement { public: explicit QUmlImage(bool createQModelingObject = true); + virtual ~QUmlImage(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinclude.cpp b/src/uml/qumlinclude.cpp index eda37cb2..4a8d06a3 100644 --- a/src/uml/qumlinclude.cpp +++ b/src/uml/qumlinclude.cpp @@ -72,6 +72,14 @@ QUmlInclude::QUmlInclude(bool createQModelingObject) : } /*! + Destroys the QUmlInclude. + */ +QUmlInclude::~QUmlInclude() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInclude. */ QModelingElement *QUmlInclude::clone() const @@ -79,16 +87,10 @@ QModelingElement *QUmlInclude::clone() const QUmlInclude *c = new QUmlInclude; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (addition()) - c->setAddition(dynamic_cast<QUmlUseCase *>(addition()->clone())); - if (includingCase()) - c->setIncludingCase(dynamic_cast<QUmlUseCase *>(includingCase()->clone())); return c; } diff --git a/src/uml/qumlinclude.h b/src/uml/qumlinclude.h index a296ec30..2577d394 100644 --- a/src/uml/qumlinclude.h +++ b/src/uml/qumlinclude.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlInclude : public QUmlDirectedRelationship, public QUmlNam { public: explicit QUmlInclude(bool createQModelingObject = true); + virtual ~QUmlInclude(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinformationflow.cpp b/src/uml/qumlinformationflow.cpp index 57d1bc98..ed587a8f 100644 --- a/src/uml/qumlinformationflow.cpp +++ b/src/uml/qumlinformationflow.cpp @@ -77,6 +77,14 @@ QUmlInformationFlow::QUmlInformationFlow(bool createQModelingObject) } /*! + Destroys the QUmlInformationFlow. + */ +QUmlInformationFlow::~QUmlInformationFlow() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInformationFlow. */ QModelingElement *QUmlInformationFlow::clone() const @@ -84,30 +92,10 @@ QModelingElement *QUmlInformationFlow::clone() const QUmlInformationFlow *c = new QUmlInformationFlow; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlClassifier *element, conveyed()) - c->addConveyed(dynamic_cast<QUmlClassifier *>(element->clone())); - foreach (QUmlNamedElement *element, informationSources()) - c->addInformationSource(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, informationTargets()) - c->addInformationTarget(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlRelationship *element, realizations()) - c->addRealization(dynamic_cast<QUmlRelationship *>(element->clone())); - foreach (QUmlActivityEdge *element, realizingActivityEdges()) - c->addRealizingActivityEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlConnector *element, realizingConnectors()) - c->addRealizingConnector(dynamic_cast<QUmlConnector *>(element->clone())); - foreach (QUmlMessage *element, realizingMessages()) - c->addRealizingMessage(dynamic_cast<QUmlMessage *>(element->clone())); return c; } diff --git a/src/uml/qumlinformationflow.h b/src/uml/qumlinformationflow.h index 2b3b525f..af9ec141 100644 --- a/src/uml/qumlinformationflow.h +++ b/src/uml/qumlinformationflow.h @@ -61,6 +61,7 @@ class Q_UML_EXPORT QUmlInformationFlow : public QUmlDirectedRelationship, public { public: explicit QUmlInformationFlow(bool createQModelingObject = true); + virtual ~QUmlInformationFlow(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinformationitem.cpp b/src/uml/qumlinformationitem.cpp index 9656931b..c6fa7799 100644 --- a/src/uml/qumlinformationitem.cpp +++ b/src/uml/qumlinformationitem.cpp @@ -89,6 +89,14 @@ QUmlInformationItem::QUmlInformationItem(bool createQModelingObject) } /*! + Destroys the QUmlInformationItem. + */ +QUmlInformationItem::~QUmlInformationItem() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInformationItem. */ QModelingElement *QUmlInformationItem::clone() const @@ -96,8 +104,6 @@ QModelingElement *QUmlInformationItem::clone() const QUmlInformationItem *c = new QUmlInformationItem; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -107,11 +113,7 @@ QModelingElement *QUmlInformationItem::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -125,20 +127,8 @@ QModelingElement *QUmlInformationItem::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlClassifier *element, represented()) - c->addRepresented(dynamic_cast<QUmlClassifier *>(element->clone())); return c; } diff --git a/src/uml/qumlinformationitem.h b/src/uml/qumlinformationitem.h index 36263116..b05e460e 100644 --- a/src/uml/qumlinformationitem.h +++ b/src/uml/qumlinformationitem.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlInformationItem : public QUmlClassifier { public: explicit QUmlInformationItem(bool createQModelingObject = true); + virtual ~QUmlInformationItem(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinitialnode.cpp b/src/uml/qumlinitialnode.cpp index 7c8f2aa7..ee354c5a 100644 --- a/src/uml/qumlinitialnode.cpp +++ b/src/uml/qumlinitialnode.cpp @@ -79,6 +79,14 @@ QUmlInitialNode::QUmlInitialNode(bool createQModelingObject) } /*! + Destroys the QUmlInitialNode. + */ +QUmlInitialNode::~QUmlInitialNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInitialNode. */ QModelingElement *QUmlInitialNode::clone() const @@ -86,27 +94,11 @@ QModelingElement *QUmlInitialNode::clone() const QUmlInitialNode *c = new QUmlInitialNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlinitialnode.h b/src/uml/qumlinitialnode.h index f1a570cf..2301550b 100644 --- a/src/uml/qumlinitialnode.h +++ b/src/uml/qumlinitialnode.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlInitialNode : public QUmlControlNode { public: explicit QUmlInitialNode(bool createQModelingObject = true); + virtual ~QUmlInitialNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinputpin.cpp b/src/uml/qumlinputpin.cpp index 0831d045..c9b5bec0 100644 --- a/src/uml/qumlinputpin.cpp +++ b/src/uml/qumlinputpin.cpp @@ -84,6 +84,14 @@ QUmlInputPin::QUmlInputPin(bool createQModelingObject) } /*! + Destroys the QUmlInputPin. + */ +QUmlInputPin::~QUmlInputPin() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInputPin. */ QModelingElement *QUmlInputPin::clone() const @@ -97,35 +105,13 @@ QModelingElement *QUmlInputPin::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); c->setControl(isControl()); diff --git a/src/uml/qumlinputpin.h b/src/uml/qumlinputpin.h index 7c00b50b..81dec37a 100644 --- a/src/uml/qumlinputpin.h +++ b/src/uml/qumlinputpin.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlInputPin : public QUmlPin { public: explicit QUmlInputPin(bool createQModelingObject = true); + virtual ~QUmlInputPin(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinstancespecification.cpp b/src/uml/qumlinstancespecification.cpp index f3c057c0..34f73f62 100644 --- a/src/uml/qumlinstancespecification.cpp +++ b/src/uml/qumlinstancespecification.cpp @@ -77,6 +77,14 @@ QUmlInstanceSpecification::QUmlInstanceSpecification(bool createQModelingObject) } /*! + Destroys the QUmlInstanceSpecification. + */ +QUmlInstanceSpecification::~QUmlInstanceSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInstanceSpecification. */ QModelingElement *QUmlInstanceSpecification::clone() const @@ -84,20 +92,12 @@ QModelingElement *QUmlInstanceSpecification::clone() const QUmlInstanceSpecification *c = new QUmlInstanceSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); foreach (QUmlDeployment *element, deployments()) c->addDeployment(dynamic_cast<QUmlDeployment *>(element->clone())); - foreach (QUmlClassifier *element, classifiers()) - c->addClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); foreach (QUmlSlot *element, slots_()) c->addSlot(dynamic_cast<QUmlSlot *>(element->clone())); if (specification()) diff --git a/src/uml/qumlinstancespecification.h b/src/uml/qumlinstancespecification.h index 8d1222ea..35823ae9 100644 --- a/src/uml/qumlinstancespecification.h +++ b/src/uml/qumlinstancespecification.h @@ -59,6 +59,7 @@ class Q_UML_EXPORT QUmlInstanceSpecification : public QUmlDeployedArtifact, publ { public: explicit QUmlInstanceSpecification(bool createQModelingObject = true); + virtual ~QUmlInstanceSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinstancevalue.cpp b/src/uml/qumlinstancevalue.cpp index cae419ff..3e52b021 100644 --- a/src/uml/qumlinstancevalue.cpp +++ b/src/uml/qumlinstancevalue.cpp @@ -75,6 +75,14 @@ QUmlInstanceValue::QUmlInstanceValue(bool createQModelingObject) : } /*! + Destroys the QUmlInstanceValue. + */ +QUmlInstanceValue::~QUmlInstanceValue() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInstanceValue. */ QModelingElement *QUmlInstanceValue::clone() const @@ -82,20 +90,10 @@ QModelingElement *QUmlInstanceValue::clone() const QUmlInstanceValue *c = new QUmlInstanceValue; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); - if (instance()) - c->setInstance(dynamic_cast<QUmlInstanceSpecification *>(instance()->clone())); return c; } diff --git a/src/uml/qumlinstancevalue.h b/src/uml/qumlinstancevalue.h index 14ad6b4e..7a6e1162 100644 --- a/src/uml/qumlinstancevalue.h +++ b/src/uml/qumlinstancevalue.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlInstanceValue : public QUmlValueSpecification { public: explicit QUmlInstanceValue(bool createQModelingObject = true); + virtual ~QUmlInstanceValue(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp index be385b76..8395d373 100644 --- a/src/uml/qumlinteraction.cpp +++ b/src/uml/qumlinteraction.cpp @@ -108,6 +108,14 @@ QUmlInteraction::QUmlInteraction(bool createQModelingObject) } /*! + Destroys the QUmlInteraction. + */ +QUmlInteraction::~QUmlInteraction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInteraction. */ QModelingElement *QUmlInteraction::clone() const @@ -115,8 +123,6 @@ QModelingElement *QUmlInteraction::clone() const QUmlInteraction *c = new QUmlInteraction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -126,11 +132,7 @@ QModelingElement *QUmlInteraction::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -143,22 +145,10 @@ QModelingElement *QUmlInteraction::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -182,16 +172,6 @@ QModelingElement *QUmlInteraction::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - foreach (QUmlBehavior *element, redefinedBehaviors()) - c->addRedefinedBehavior(dynamic_cast<QUmlBehavior *>(element->clone())); - if (specification()) - c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone())); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); foreach (QUmlAction *element, actions()) diff --git a/src/uml/qumlinteraction.h b/src/uml/qumlinteraction.h index 098eb4ef..2fa1d1fa 100644 --- a/src/uml/qumlinteraction.h +++ b/src/uml/qumlinteraction.h @@ -59,6 +59,7 @@ class Q_UML_EXPORT QUmlInteraction : public QUmlBehavior, public QUmlInteraction { public: explicit QUmlInteraction(bool createQModelingObject = true); + virtual ~QUmlInteraction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinteractionconstraint.cpp b/src/uml/qumlinteractionconstraint.cpp index cfeca233..f40021c0 100644 --- a/src/uml/qumlinteractionconstraint.cpp +++ b/src/uml/qumlinteractionconstraint.cpp @@ -76,6 +76,14 @@ QUmlInteractionConstraint::QUmlInteractionConstraint(bool createQModelingObject) } /*! + Destroys the QUmlInteractionConstraint. + */ +QUmlInteractionConstraint::~QUmlInteractionConstraint() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInteractionConstraint. */ QModelingElement *QUmlInteractionConstraint::clone() const @@ -83,20 +91,10 @@ QModelingElement *QUmlInteractionConstraint::clone() const QUmlInteractionConstraint *c = new QUmlInteractionConstraint; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlElement *element, constrainedElements()) - c->addConstrainedElement(dynamic_cast<QUmlElement *>(element->clone())); - if (context()) - c->setContext(dynamic_cast<QUmlNamespace *>(context()->clone())); if (specification()) c->setSpecification(dynamic_cast<QUmlValueSpecification *>(specification()->clone())); if (maxint()) diff --git a/src/uml/qumlinteractionconstraint.h b/src/uml/qumlinteractionconstraint.h index 9130911a..e57a35de 100644 --- a/src/uml/qumlinteractionconstraint.h +++ b/src/uml/qumlinteractionconstraint.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlInteractionConstraint : public QUmlConstraint { public: explicit QUmlInteractionConstraint(bool createQModelingObject = true); + virtual ~QUmlInteractionConstraint(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinteractionfragment.cpp b/src/uml/qumlinteractionfragment.cpp index 196fde7a..f546ee3f 100644 --- a/src/uml/qumlinteractionfragment.cpp +++ b/src/uml/qumlinteractionfragment.cpp @@ -73,6 +73,14 @@ QUmlInteractionFragment::QUmlInteractionFragment() : } /*! + Destroys the QUmlInteractionFragment. + */ +QUmlInteractionFragment::~QUmlInteractionFragment() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInteractionFragment. */ QModelingElement *QUmlInteractionFragment::clone() const @@ -80,18 +88,10 @@ QModelingElement *QUmlInteractionFragment::clone() const QUmlInteractionFragment *c = new QUmlInteractionFragment; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); return c; diff --git a/src/uml/qumlinteractionfragment.h b/src/uml/qumlinteractionfragment.h index a5e884ed..91e3bff1 100644 --- a/src/uml/qumlinteractionfragment.h +++ b/src/uml/qumlinteractionfragment.h @@ -57,6 +57,8 @@ class QUmlLifeline; class Q_UML_EXPORT QUmlInteractionFragment : public virtual QUmlNamedElement { public: + virtual ~QUmlInteractionFragment(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlinteractionoperand.cpp b/src/uml/qumlinteractionoperand.cpp index 548d16c1..a27f3095 100644 --- a/src/uml/qumlinteractionoperand.cpp +++ b/src/uml/qumlinteractionoperand.cpp @@ -78,6 +78,14 @@ QUmlInteractionOperand::QUmlInteractionOperand(bool createQModelingObject) : } /*! + Destroys the QUmlInteractionOperand. + */ +QUmlInteractionOperand::~QUmlInteractionOperand() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInteractionOperand. */ QModelingElement *QUmlInteractionOperand::clone() const @@ -85,18 +93,10 @@ QModelingElement *QUmlInteractionOperand::clone() const QUmlInteractionOperand *c = new QUmlInteractionOperand; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); foreach (QUmlElementImport *element, elementImports()) diff --git a/src/uml/qumlinteractionoperand.h b/src/uml/qumlinteractionoperand.h index f092a7e1..334d0e68 100644 --- a/src/uml/qumlinteractionoperand.h +++ b/src/uml/qumlinteractionoperand.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlInteractionOperand : public QUmlInteractionFragment, publ { public: explicit QUmlInteractionOperand(bool createQModelingObject = true); + virtual ~QUmlInteractionOperand(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinteractionuse.cpp b/src/uml/qumlinteractionuse.cpp index ea64decb..5de04ad4 100644 --- a/src/uml/qumlinteractionuse.cpp +++ b/src/uml/qumlinteractionuse.cpp @@ -80,6 +80,14 @@ QUmlInteractionUse::QUmlInteractionUse(bool createQModelingObject) : } /*! + Destroys the QUmlInteractionUse. + */ +QUmlInteractionUse::~QUmlInteractionUse() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInteractionUse. */ QModelingElement *QUmlInteractionUse::clone() const @@ -87,30 +95,18 @@ QModelingElement *QUmlInteractionUse::clone() const QUmlInteractionUse *c = new QUmlInteractionUse; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); foreach (QUmlGate *element, actualGates()) c->addActualGate(dynamic_cast<QUmlGate *>(element->clone())); foreach (QUmlValueSpecification *element, arguments()) c->addArgument(dynamic_cast<QUmlValueSpecification *>(element->clone())); - if (refersTo()) - c->setRefersTo(dynamic_cast<QUmlInteraction *>(refersTo()->clone())); if (returnValue()) c->setReturnValue(dynamic_cast<QUmlValueSpecification *>(returnValue()->clone())); - if (returnValueRecipient()) - c->setReturnValueRecipient(dynamic_cast<QUmlProperty *>(returnValueRecipient()->clone())); return c; } diff --git a/src/uml/qumlinteractionuse.h b/src/uml/qumlinteractionuse.h index 257456d2..f0154228 100644 --- a/src/uml/qumlinteractionuse.h +++ b/src/uml/qumlinteractionuse.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlInteractionUse : public QUmlInteractionFragment { public: explicit QUmlInteractionUse(bool createQModelingObject = true); + virtual ~QUmlInteractionUse(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinterface.cpp b/src/uml/qumlinterface.cpp index 00b13ca1..0058f1b5 100644 --- a/src/uml/qumlinterface.cpp +++ b/src/uml/qumlinterface.cpp @@ -93,6 +93,14 @@ QUmlInterface::QUmlInterface(bool createQModelingObject) : } /*! + Destroys the QUmlInterface. + */ +QUmlInterface::~QUmlInterface() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInterface. */ QModelingElement *QUmlInterface::clone() const @@ -100,8 +108,6 @@ QModelingElement *QUmlInterface::clone() const QUmlInterface *c = new QUmlInterface; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -111,11 +117,7 @@ QModelingElement *QUmlInterface::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -129,18 +131,8 @@ QModelingElement *QUmlInterface::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlClassifier *element, nestedClassifiers()) c->addNestedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) @@ -151,8 +143,6 @@ QModelingElement *QUmlInterface::clone() const c->addOwnedReception(dynamic_cast<QUmlReception *>(element->clone())); if (protocol()) c->setProtocol(dynamic_cast<QUmlProtocolStateMachine *>(protocol()->clone())); - foreach (QUmlInterface *element, redefinedInterfaces()) - c->addRedefinedInterface(dynamic_cast<QUmlInterface *>(element->clone())); return c; } diff --git a/src/uml/qumlinterface.h b/src/uml/qumlinterface.h index f9f56042..680e4b52 100644 --- a/src/uml/qumlinterface.h +++ b/src/uml/qumlinterface.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlInterface : public QUmlClassifier { public: explicit QUmlInterface(bool createQModelingObject = true); + virtual ~QUmlInterface(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinterfacerealization.cpp b/src/uml/qumlinterfacerealization.cpp index 54a5dfd3..37610318 100644 --- a/src/uml/qumlinterfacerealization.cpp +++ b/src/uml/qumlinterfacerealization.cpp @@ -78,6 +78,14 @@ QUmlInterfaceRealization::QUmlInterfaceRealization(bool createQModelingObject) : } /*! + Destroys the QUmlInterfaceRealization. + */ +QUmlInterfaceRealization::~QUmlInterfaceRealization() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInterfaceRealization. */ QModelingElement *QUmlInterfaceRealization::clone() const @@ -85,26 +93,12 @@ QModelingElement *QUmlInterfaceRealization::clone() const QUmlInterfaceRealization *c = new QUmlInterfaceRealization; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); if (mapping()) c->setMapping(dynamic_cast<QUmlOpaqueExpression *>(mapping()->clone())); - if (contract()) - c->setContract(dynamic_cast<QUmlInterface *>(contract()->clone())); - if (implementingClassifier()) - c->setImplementingClassifier(dynamic_cast<QUmlBehavioredClassifier *>(implementingClassifier()->clone())); return c; } diff --git a/src/uml/qumlinterfacerealization.h b/src/uml/qumlinterfacerealization.h index db2f392b..1bb137cb 100644 --- a/src/uml/qumlinterfacerealization.h +++ b/src/uml/qumlinterfacerealization.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlInterfaceRealization : public QUmlRealization { public: explicit QUmlInterfaceRealization(bool createQModelingObject = true); + virtual ~QUmlInterfaceRealization(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinterruptibleactivityregion.cpp b/src/uml/qumlinterruptibleactivityregion.cpp index cb2a2384..81d56115 100644 --- a/src/uml/qumlinterruptibleactivityregion.cpp +++ b/src/uml/qumlinterruptibleactivityregion.cpp @@ -73,6 +73,14 @@ QUmlInterruptibleActivityRegion::QUmlInterruptibleActivityRegion(bool createQMod } /*! + Destroys the QUmlInterruptibleActivityRegion. + */ +QUmlInterruptibleActivityRegion::~QUmlInterruptibleActivityRegion() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInterruptibleActivityRegion. */ QModelingElement *QUmlInterruptibleActivityRegion::clone() const @@ -80,18 +88,10 @@ QModelingElement *QUmlInterruptibleActivityRegion::clone() const QUmlInterruptibleActivityRegion *c = new QUmlInterruptibleActivityRegion; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (inActivity()) - c->setInActivity(dynamic_cast<QUmlActivity *>(inActivity()->clone())); - foreach (QUmlActivityEdge *element, interruptingEdges()) - c->addInterruptingEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, nodes()) - c->addNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlinterruptibleactivityregion.h b/src/uml/qumlinterruptibleactivityregion.h index 099395ef..0118b2d9 100644 --- a/src/uml/qumlinterruptibleactivityregion.h +++ b/src/uml/qumlinterruptibleactivityregion.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlInterruptibleActivityRegion : public QUmlActivityGroup { public: explicit QUmlInterruptibleActivityRegion(bool createQModelingObject = true); + virtual ~QUmlInterruptibleActivityRegion(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinterval.cpp b/src/uml/qumlinterval.cpp index 7a171830..de45e7dd 100644 --- a/src/uml/qumlinterval.cpp +++ b/src/uml/qumlinterval.cpp @@ -75,6 +75,14 @@ QUmlInterval::QUmlInterval(bool createQModelingObject) : } /*! + Destroys the QUmlInterval. + */ +QUmlInterval::~QUmlInterval() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInterval. */ QModelingElement *QUmlInterval::clone() const @@ -82,22 +90,10 @@ QModelingElement *QUmlInterval::clone() const QUmlInterval *c = new QUmlInterval; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); - if (max()) - c->setMax(dynamic_cast<QUmlValueSpecification *>(max()->clone())); - if (min()) - c->setMin(dynamic_cast<QUmlValueSpecification *>(min()->clone())); return c; } diff --git a/src/uml/qumlinterval.h b/src/uml/qumlinterval.h index 6a058b95..660024b3 100644 --- a/src/uml/qumlinterval.h +++ b/src/uml/qumlinterval.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlInterval : public QUmlValueSpecification { public: explicit QUmlInterval(bool createQModelingObject = true); + virtual ~QUmlInterval(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlintervalconstraint.cpp b/src/uml/qumlintervalconstraint.cpp index fb188ab8..17a9724f 100644 --- a/src/uml/qumlintervalconstraint.cpp +++ b/src/uml/qumlintervalconstraint.cpp @@ -76,6 +76,14 @@ QUmlIntervalConstraint::QUmlIntervalConstraint(bool createQModelingObject) : } /*! + Destroys the QUmlIntervalConstraint. + */ +QUmlIntervalConstraint::~QUmlIntervalConstraint() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlIntervalConstraint. */ QModelingElement *QUmlIntervalConstraint::clone() const @@ -83,20 +91,10 @@ QModelingElement *QUmlIntervalConstraint::clone() const QUmlIntervalConstraint *c = new QUmlIntervalConstraint; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlElement *element, constrainedElements()) - c->addConstrainedElement(dynamic_cast<QUmlElement *>(element->clone())); - if (context()) - c->setContext(dynamic_cast<QUmlNamespace *>(context()->clone())); if (specification()) c->setSpecification(dynamic_cast<QUmlInterval *>(specification()->clone())); return c; diff --git a/src/uml/qumlintervalconstraint.h b/src/uml/qumlintervalconstraint.h index b51ae311..6c080128 100644 --- a/src/uml/qumlintervalconstraint.h +++ b/src/uml/qumlintervalconstraint.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlIntervalConstraint : public QUmlConstraint { public: explicit QUmlIntervalConstraint(bool createQModelingObject = true); + virtual ~QUmlIntervalConstraint(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlinvocationaction.cpp b/src/uml/qumlinvocationaction.cpp index fb0af5ce..5d34aac6 100644 --- a/src/uml/qumlinvocationaction.cpp +++ b/src/uml/qumlinvocationaction.cpp @@ -83,6 +83,14 @@ QUmlInvocationAction::QUmlInvocationAction() : } /*! + Destroys the QUmlInvocationAction. + */ +QUmlInvocationAction::~QUmlInvocationAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlInvocationAction. */ QModelingElement *QUmlInvocationAction::clone() const @@ -90,27 +98,11 @@ QModelingElement *QUmlInvocationAction::clone() const QUmlInvocationAction *c = new QUmlInvocationAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -120,8 +112,6 @@ QModelingElement *QUmlInvocationAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlInputPin *element, arguments()) c->addArgument(dynamic_cast<QUmlInputPin *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); return c; } diff --git a/src/uml/qumlinvocationaction.h b/src/uml/qumlinvocationaction.h index e6596a3d..57236b99 100644 --- a/src/uml/qumlinvocationaction.h +++ b/src/uml/qumlinvocationaction.h @@ -55,6 +55,8 @@ class QUmlPort; class Q_UML_EXPORT QUmlInvocationAction : public QUmlAction { public: + virtual ~QUmlInvocationAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumljoinnode.cpp b/src/uml/qumljoinnode.cpp index 844bd383..52866200 100644 --- a/src/uml/qumljoinnode.cpp +++ b/src/uml/qumljoinnode.cpp @@ -82,6 +82,14 @@ QUmlJoinNode::QUmlJoinNode(bool createQModelingObject) : } /*! + Destroys the QUmlJoinNode. + */ +QUmlJoinNode::~QUmlJoinNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlJoinNode. */ QModelingElement *QUmlJoinNode::clone() const @@ -89,27 +97,11 @@ QModelingElement *QUmlJoinNode::clone() const QUmlJoinNode *c = new QUmlJoinNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); c->setCombineDuplicate(isCombineDuplicate()); if (joinSpec()) c->setJoinSpec(dynamic_cast<QUmlValueSpecification *>(joinSpec()->clone())); diff --git a/src/uml/qumljoinnode.h b/src/uml/qumljoinnode.h index c92cc1c8..a7638f8f 100644 --- a/src/uml/qumljoinnode.h +++ b/src/uml/qumljoinnode.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlJoinNode : public QUmlControlNode { public: explicit QUmlJoinNode(bool createQModelingObject = true); + virtual ~QUmlJoinNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumllifeline.cpp b/src/uml/qumllifeline.cpp index 78aaf6f0..18598ede 100644 --- a/src/uml/qumllifeline.cpp +++ b/src/uml/qumllifeline.cpp @@ -78,6 +78,14 @@ QUmlLifeline::QUmlLifeline(bool createQModelingObject) : } /*! + Destroys the QUmlLifeline. + */ +QUmlLifeline::~QUmlLifeline() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLifeline. */ QModelingElement *QUmlLifeline::clone() const @@ -85,20 +93,10 @@ QModelingElement *QUmlLifeline::clone() const QUmlLifeline *c = new QUmlLifeline; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlInteractionFragment *element, coveredBy()) - c->addCoveredBy(dynamic_cast<QUmlInteractionFragment *>(element->clone())); - if (decomposedAs()) - c->setDecomposedAs(dynamic_cast<QUmlPartDecomposition *>(decomposedAs()->clone())); - if (interaction()) - c->setInteraction(dynamic_cast<QUmlInteraction *>(interaction()->clone())); - if (represents()) - c->setRepresents(dynamic_cast<QUmlConnectableElement *>(represents()->clone())); if (selector()) c->setSelector(dynamic_cast<QUmlValueSpecification *>(selector()->clone())); return c; diff --git a/src/uml/qumllifeline.h b/src/uml/qumllifeline.h index 57dd0347..116cd066 100644 --- a/src/uml/qumllifeline.h +++ b/src/uml/qumllifeline.h @@ -59,6 +59,7 @@ class Q_UML_EXPORT QUmlLifeline : public QUmlNamedElement { public: explicit QUmlLifeline(bool createQModelingObject = true); + virtual ~QUmlLifeline(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumllinkaction.cpp b/src/uml/qumllinkaction.cpp index 78d61a69..e14c88df 100644 --- a/src/uml/qumllinkaction.cpp +++ b/src/uml/qumllinkaction.cpp @@ -83,6 +83,14 @@ QUmlLinkAction::QUmlLinkAction() } /*! + Destroys the QUmlLinkAction. + */ +QUmlLinkAction::~QUmlLinkAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLinkAction. */ QModelingElement *QUmlLinkAction::clone() const @@ -90,27 +98,11 @@ QModelingElement *QUmlLinkAction::clone() const QUmlLinkAction *c = new QUmlLinkAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumllinkaction.h b/src/uml/qumllinkaction.h index 120134b5..7d0ed2ef 100644 --- a/src/uml/qumllinkaction.h +++ b/src/uml/qumllinkaction.h @@ -56,6 +56,8 @@ class QUmlLinkEndData; class Q_UML_EXPORT QUmlLinkAction : public QUmlAction { public: + virtual ~QUmlLinkAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumllinkendcreationdata.cpp b/src/uml/qumllinkendcreationdata.cpp index 292983ad..05730f50 100644 --- a/src/uml/qumllinkendcreationdata.cpp +++ b/src/uml/qumllinkendcreationdata.cpp @@ -71,6 +71,14 @@ QUmlLinkEndCreationData::QUmlLinkEndCreationData(bool createQModelingObject) : } /*! + Destroys the QUmlLinkEndCreationData. + */ +QUmlLinkEndCreationData::~QUmlLinkEndCreationData() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLinkEndCreationData. */ QModelingElement *QUmlLinkEndCreationData::clone() const @@ -78,14 +86,8 @@ QModelingElement *QUmlLinkEndCreationData::clone() const QUmlLinkEndCreationData *c = new QUmlLinkEndCreationData; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (end()) - c->setEnd(dynamic_cast<QUmlProperty *>(end()->clone())); foreach (QUmlQualifierValue *element, qualifiers()) c->addQualifier(dynamic_cast<QUmlQualifierValue *>(element->clone())); - if (value()) - c->setValue(dynamic_cast<QUmlInputPin *>(value()->clone())); - if (insertAt()) - c->setInsertAt(dynamic_cast<QUmlInputPin *>(insertAt()->clone())); c->setReplaceAll(isReplaceAll()); return c; } diff --git a/src/uml/qumllinkendcreationdata.h b/src/uml/qumllinkendcreationdata.h index 2330fe05..09ad6251 100644 --- a/src/uml/qumllinkendcreationdata.h +++ b/src/uml/qumllinkendcreationdata.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlLinkEndCreationData : public QUmlLinkEndData { public: explicit QUmlLinkEndCreationData(bool createQModelingObject = true); + virtual ~QUmlLinkEndCreationData(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumllinkenddata.cpp b/src/uml/qumllinkenddata.cpp index 69366ad2..9633ecbb 100644 --- a/src/uml/qumllinkenddata.cpp +++ b/src/uml/qumllinkenddata.cpp @@ -69,6 +69,14 @@ QUmlLinkEndData::QUmlLinkEndData(bool createQModelingObject) : } /*! + Destroys the QUmlLinkEndData. + */ +QUmlLinkEndData::~QUmlLinkEndData() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLinkEndData. */ QModelingElement *QUmlLinkEndData::clone() const @@ -76,12 +84,8 @@ QModelingElement *QUmlLinkEndData::clone() const QUmlLinkEndData *c = new QUmlLinkEndData; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (end()) - c->setEnd(dynamic_cast<QUmlProperty *>(end()->clone())); foreach (QUmlQualifierValue *element, qualifiers()) c->addQualifier(dynamic_cast<QUmlQualifierValue *>(element->clone())); - if (value()) - c->setValue(dynamic_cast<QUmlInputPin *>(value()->clone())); return c; } diff --git a/src/uml/qumllinkenddata.h b/src/uml/qumllinkenddata.h index 8d90797c..7e02754d 100644 --- a/src/uml/qumllinkenddata.h +++ b/src/uml/qumllinkenddata.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlLinkEndData : public QUmlElement { public: explicit QUmlLinkEndData(bool createQModelingObject = true); + virtual ~QUmlLinkEndData(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumllinkenddestructiondata.cpp b/src/uml/qumllinkenddestructiondata.cpp index 6c3b6923..b9e3df56 100644 --- a/src/uml/qumllinkenddestructiondata.cpp +++ b/src/uml/qumllinkenddestructiondata.cpp @@ -71,6 +71,14 @@ QUmlLinkEndDestructionData::QUmlLinkEndDestructionData(bool createQModelingObjec } /*! + Destroys the QUmlLinkEndDestructionData. + */ +QUmlLinkEndDestructionData::~QUmlLinkEndDestructionData() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLinkEndDestructionData. */ QModelingElement *QUmlLinkEndDestructionData::clone() const @@ -78,14 +86,8 @@ QModelingElement *QUmlLinkEndDestructionData::clone() const QUmlLinkEndDestructionData *c = new QUmlLinkEndDestructionData; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (end()) - c->setEnd(dynamic_cast<QUmlProperty *>(end()->clone())); foreach (QUmlQualifierValue *element, qualifiers()) c->addQualifier(dynamic_cast<QUmlQualifierValue *>(element->clone())); - if (value()) - c->setValue(dynamic_cast<QUmlInputPin *>(value()->clone())); - if (destroyAt()) - c->setDestroyAt(dynamic_cast<QUmlInputPin *>(destroyAt()->clone())); c->setDestroyDuplicates(isDestroyDuplicates()); return c; } diff --git a/src/uml/qumllinkenddestructiondata.h b/src/uml/qumllinkenddestructiondata.h index 74930aae..9c32979d 100644 --- a/src/uml/qumllinkenddestructiondata.h +++ b/src/uml/qumllinkenddestructiondata.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlLinkEndDestructionData : public QUmlLinkEndData { public: explicit QUmlLinkEndDestructionData(bool createQModelingObject = true); + virtual ~QUmlLinkEndDestructionData(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralboolean.cpp b/src/uml/qumlliteralboolean.cpp index 06af3298..f8b1da47 100644 --- a/src/uml/qumlliteralboolean.cpp +++ b/src/uml/qumlliteralboolean.cpp @@ -74,6 +74,14 @@ QUmlLiteralBoolean::QUmlLiteralBoolean(bool createQModelingObject) : } /*! + Destroys the QUmlLiteralBoolean. + */ +QUmlLiteralBoolean::~QUmlLiteralBoolean() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLiteralBoolean. */ QModelingElement *QUmlLiteralBoolean::clone() const @@ -81,17 +89,9 @@ QModelingElement *QUmlLiteralBoolean::clone() const QUmlLiteralBoolean *c = new QUmlLiteralBoolean; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); c->setValue(value()); return c; diff --git a/src/uml/qumlliteralboolean.h b/src/uml/qumlliteralboolean.h index 075e8279..6341efef 100644 --- a/src/uml/qumlliteralboolean.h +++ b/src/uml/qumlliteralboolean.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlLiteralBoolean : public QUmlLiteralSpecification { public: explicit QUmlLiteralBoolean(bool createQModelingObject = true); + virtual ~QUmlLiteralBoolean(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralinteger.cpp b/src/uml/qumlliteralinteger.cpp index c7201499..edbeb1fe 100644 --- a/src/uml/qumlliteralinteger.cpp +++ b/src/uml/qumlliteralinteger.cpp @@ -74,6 +74,14 @@ QUmlLiteralInteger::QUmlLiteralInteger(bool createQModelingObject) : } /*! + Destroys the QUmlLiteralInteger. + */ +QUmlLiteralInteger::~QUmlLiteralInteger() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLiteralInteger. */ QModelingElement *QUmlLiteralInteger::clone() const @@ -81,17 +89,9 @@ QModelingElement *QUmlLiteralInteger::clone() const QUmlLiteralInteger *c = new QUmlLiteralInteger; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); c->setValue(value()); return c; diff --git a/src/uml/qumlliteralinteger.h b/src/uml/qumlliteralinteger.h index 85c726e6..3e175cf1 100644 --- a/src/uml/qumlliteralinteger.h +++ b/src/uml/qumlliteralinteger.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlLiteralInteger : public QUmlLiteralSpecification { public: explicit QUmlLiteralInteger(bool createQModelingObject = true); + virtual ~QUmlLiteralInteger(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralnull.cpp b/src/uml/qumlliteralnull.cpp index f755a870..b0ce9352 100644 --- a/src/uml/qumlliteralnull.cpp +++ b/src/uml/qumlliteralnull.cpp @@ -73,6 +73,14 @@ QUmlLiteralNull::QUmlLiteralNull(bool createQModelingObject) } /*! + Destroys the QUmlLiteralNull. + */ +QUmlLiteralNull::~QUmlLiteralNull() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLiteralNull. */ QModelingElement *QUmlLiteralNull::clone() const @@ -80,17 +88,9 @@ QModelingElement *QUmlLiteralNull::clone() const QUmlLiteralNull *c = new QUmlLiteralNull; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); return c; } diff --git a/src/uml/qumlliteralnull.h b/src/uml/qumlliteralnull.h index d771f237..dddfa379 100644 --- a/src/uml/qumlliteralnull.h +++ b/src/uml/qumlliteralnull.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlLiteralNull : public QUmlLiteralSpecification { public: explicit QUmlLiteralNull(bool createQModelingObject = true); + virtual ~QUmlLiteralNull(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralreal.cpp b/src/uml/qumlliteralreal.cpp index 5232583f..86624788 100644 --- a/src/uml/qumlliteralreal.cpp +++ b/src/uml/qumlliteralreal.cpp @@ -73,6 +73,14 @@ QUmlLiteralReal::QUmlLiteralReal(bool createQModelingObject) } /*! + Destroys the QUmlLiteralReal. + */ +QUmlLiteralReal::~QUmlLiteralReal() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLiteralReal. */ QModelingElement *QUmlLiteralReal::clone() const @@ -80,17 +88,9 @@ QModelingElement *QUmlLiteralReal::clone() const QUmlLiteralReal *c = new QUmlLiteralReal; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); c->setValue(value()); return c; diff --git a/src/uml/qumlliteralreal.h b/src/uml/qumlliteralreal.h index bffe4882..a90e7335 100644 --- a/src/uml/qumlliteralreal.h +++ b/src/uml/qumlliteralreal.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlLiteralReal : public QUmlLiteralSpecification { public: explicit QUmlLiteralReal(bool createQModelingObject = true); + virtual ~QUmlLiteralReal(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralspecification.cpp b/src/uml/qumlliteralspecification.cpp index de4968c2..c6db4183 100644 --- a/src/uml/qumlliteralspecification.cpp +++ b/src/uml/qumlliteralspecification.cpp @@ -71,6 +71,14 @@ QUmlLiteralSpecification::QUmlLiteralSpecification() } /*! + Destroys the QUmlLiteralSpecification. + */ +QUmlLiteralSpecification::~QUmlLiteralSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLiteralSpecification. */ QModelingElement *QUmlLiteralSpecification::clone() const @@ -78,17 +86,9 @@ QModelingElement *QUmlLiteralSpecification::clone() const QUmlLiteralSpecification *c = new QUmlLiteralSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); return c; } diff --git a/src/uml/qumlliteralspecification.h b/src/uml/qumlliteralspecification.h index b631a5b0..1350321c 100644 --- a/src/uml/qumlliteralspecification.h +++ b/src/uml/qumlliteralspecification.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlLiteralSpecification : public QUmlValueSpecification { public: + virtual ~QUmlLiteralSpecification(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralstring.cpp b/src/uml/qumlliteralstring.cpp index 6f4b8665..a5c1d18e 100644 --- a/src/uml/qumlliteralstring.cpp +++ b/src/uml/qumlliteralstring.cpp @@ -73,6 +73,14 @@ QUmlLiteralString::QUmlLiteralString(bool createQModelingObject) } /*! + Destroys the QUmlLiteralString. + */ +QUmlLiteralString::~QUmlLiteralString() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLiteralString. */ QModelingElement *QUmlLiteralString::clone() const @@ -80,17 +88,9 @@ QModelingElement *QUmlLiteralString::clone() const QUmlLiteralString *c = new QUmlLiteralString; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); c->setValue(value()); return c; diff --git a/src/uml/qumlliteralstring.h b/src/uml/qumlliteralstring.h index e0755ec5..f4884df0 100644 --- a/src/uml/qumlliteralstring.h +++ b/src/uml/qumlliteralstring.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlLiteralString : public QUmlLiteralSpecification { public: explicit QUmlLiteralString(bool createQModelingObject = true); + virtual ~QUmlLiteralString(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralunlimitednatural.cpp b/src/uml/qumlliteralunlimitednatural.cpp index 4d500cfe..02db03f6 100644 --- a/src/uml/qumlliteralunlimitednatural.cpp +++ b/src/uml/qumlliteralunlimitednatural.cpp @@ -73,6 +73,14 @@ QUmlLiteralUnlimitedNatural::QUmlLiteralUnlimitedNatural(bool createQModelingObj } /*! + Destroys the QUmlLiteralUnlimitedNatural. + */ +QUmlLiteralUnlimitedNatural::~QUmlLiteralUnlimitedNatural() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLiteralUnlimitedNatural. */ QModelingElement *QUmlLiteralUnlimitedNatural::clone() const @@ -80,17 +88,9 @@ QModelingElement *QUmlLiteralUnlimitedNatural::clone() const QUmlLiteralUnlimitedNatural *c = new QUmlLiteralUnlimitedNatural; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); c->setValue(value()); return c; diff --git a/src/uml/qumlliteralunlimitednatural.h b/src/uml/qumlliteralunlimitednatural.h index 91e66da3..63335029 100644 --- a/src/uml/qumlliteralunlimitednatural.h +++ b/src/uml/qumlliteralunlimitednatural.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlLiteralUnlimitedNatural : public QUmlLiteralSpecification { public: explicit QUmlLiteralUnlimitedNatural(bool createQModelingObject = true); + virtual ~QUmlLiteralUnlimitedNatural(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlloopnode.cpp b/src/uml/qumlloopnode.cpp index ac585b5d..c55b2dae 100644 --- a/src/uml/qumlloopnode.cpp +++ b/src/uml/qumlloopnode.cpp @@ -90,6 +90,14 @@ QUmlLoopNode::QUmlLoopNode(bool createQModelingObject) : } /*! + Destroys the QUmlLoopNode. + */ +QUmlLoopNode::~QUmlLoopNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlLoopNode. */ QModelingElement *QUmlLoopNode::clone() const @@ -97,25 +105,11 @@ QModelingElement *QUmlLoopNode::clone() const QUmlLoopNode *c = new QUmlLoopNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -129,8 +123,6 @@ QModelingElement *QUmlLoopNode::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); foreach (QUmlActivityEdge *element, edges()) c->addEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); c->setMustIsolate(mustIsolate()); @@ -138,23 +130,11 @@ QModelingElement *QUmlLoopNode::clone() const c->addNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlVariable *element, variables()) c->addVariable(dynamic_cast<QUmlVariable *>(element->clone())); - foreach (QUmlOutputPin *element, bodyOutputs()) - c->addBodyOutput(dynamic_cast<QUmlOutputPin *>(element->clone())); - foreach (QUmlExecutableNode *element, bodyParts()) - c->addBodyPart(dynamic_cast<QUmlExecutableNode *>(element->clone())); - if (decider()) - c->setDecider(dynamic_cast<QUmlOutputPin *>(decider()->clone())); c->setTestedFirst(isTestedFirst()); - foreach (QUmlOutputPin *element, loopVariables()) - c->addLoopVariable(dynamic_cast<QUmlOutputPin *>(element->clone())); foreach (QUmlInputPin *element, loopVariableInputs()) c->addLoopVariableInput(dynamic_cast<QUmlInputPin *>(element->clone())); foreach (QUmlOutputPin *element, results()) c->addResult(dynamic_cast<QUmlOutputPin *>(element->clone())); - foreach (QUmlExecutableNode *element, setupParts()) - c->addSetupPart(dynamic_cast<QUmlExecutableNode *>(element->clone())); - foreach (QUmlExecutableNode *element, tests()) - c->addTest(dynamic_cast<QUmlExecutableNode *>(element->clone())); return c; } diff --git a/src/uml/qumlloopnode.h b/src/uml/qumlloopnode.h index 24bab808..d0ec8d65 100644 --- a/src/uml/qumlloopnode.h +++ b/src/uml/qumlloopnode.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlLoopNode : public QUmlStructuredActivityNode { public: explicit QUmlLoopNode(bool createQModelingObject = true); + virtual ~QUmlLoopNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmanifestation.cpp b/src/uml/qumlmanifestation.cpp index 500545ca..067925bc 100644 --- a/src/uml/qumlmanifestation.cpp +++ b/src/uml/qumlmanifestation.cpp @@ -76,6 +76,14 @@ QUmlManifestation::QUmlManifestation(bool createQModelingObject) : } /*! + Destroys the QUmlManifestation. + */ +QUmlManifestation::~QUmlManifestation() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlManifestation. */ QModelingElement *QUmlManifestation::clone() const @@ -83,24 +91,12 @@ QModelingElement *QUmlManifestation::clone() const QUmlManifestation *c = new QUmlManifestation; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); if (mapping()) c->setMapping(dynamic_cast<QUmlOpaqueExpression *>(mapping()->clone())); - if (utilizedElement()) - c->setUtilizedElement(dynamic_cast<QUmlPackageableElement *>(utilizedElement()->clone())); return c; } diff --git a/src/uml/qumlmanifestation.h b/src/uml/qumlmanifestation.h index a019d3c8..47ef208a 100644 --- a/src/uml/qumlmanifestation.h +++ b/src/uml/qumlmanifestation.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlManifestation : public QUmlAbstraction { public: explicit QUmlManifestation(bool createQModelingObject = true); + virtual ~QUmlManifestation(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmergenode.cpp b/src/uml/qumlmergenode.cpp index 79a1b7e1..dc071225 100644 --- a/src/uml/qumlmergenode.cpp +++ b/src/uml/qumlmergenode.cpp @@ -79,6 +79,14 @@ QUmlMergeNode::QUmlMergeNode(bool createQModelingObject) } /*! + Destroys the QUmlMergeNode. + */ +QUmlMergeNode::~QUmlMergeNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlMergeNode. */ QModelingElement *QUmlMergeNode::clone() const @@ -86,27 +94,11 @@ QModelingElement *QUmlMergeNode::clone() const QUmlMergeNode *c = new QUmlMergeNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); return c; } diff --git a/src/uml/qumlmergenode.h b/src/uml/qumlmergenode.h index d0b95380..181145cb 100644 --- a/src/uml/qumlmergenode.h +++ b/src/uml/qumlmergenode.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlMergeNode : public QUmlControlNode { public: explicit QUmlMergeNode(bool createQModelingObject = true); + virtual ~QUmlMergeNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmessage.cpp b/src/uml/qumlmessage.cpp index e971cf2a..5f933e4c 100644 --- a/src/uml/qumlmessage.cpp +++ b/src/uml/qumlmessage.cpp @@ -79,6 +79,14 @@ QUmlMessage::QUmlMessage(bool createQModelingObject) : } /*! + Destroys the QUmlMessage. + */ +QUmlMessage::~QUmlMessage() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlMessage. */ QModelingElement *QUmlMessage::clone() const @@ -86,25 +94,13 @@ QModelingElement *QUmlMessage::clone() const QUmlMessage *c = new QUmlMessage; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); foreach (QUmlValueSpecification *element, arguments()) c->addArgument(dynamic_cast<QUmlValueSpecification *>(element->clone())); - if (connector()) - c->setConnector(dynamic_cast<QUmlConnector *>(connector()->clone())); - if (interaction()) - c->setInteraction(dynamic_cast<QUmlInteraction *>(interaction()->clone())); c->setMessageSort(messageSort()); - if (receiveEvent()) - c->setReceiveEvent(dynamic_cast<QUmlMessageEnd *>(receiveEvent()->clone())); - if (sendEvent()) - c->setSendEvent(dynamic_cast<QUmlMessageEnd *>(sendEvent()->clone())); - if (signature()) - c->setSignature(dynamic_cast<QUmlNamedElement *>(signature()->clone())); return c; } diff --git a/src/uml/qumlmessage.h b/src/uml/qumlmessage.h index 8577e9fe..99ffba1b 100644 --- a/src/uml/qumlmessage.h +++ b/src/uml/qumlmessage.h @@ -60,6 +60,7 @@ class Q_UML_EXPORT QUmlMessage : public QUmlNamedElement { public: explicit QUmlMessage(bool createQModelingObject = true); + virtual ~QUmlMessage(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmessageend.cpp b/src/uml/qumlmessageend.cpp index 89fd6fe5..980cc044 100644 --- a/src/uml/qumlmessageend.cpp +++ b/src/uml/qumlmessageend.cpp @@ -69,6 +69,14 @@ QUmlMessageEnd::QUmlMessageEnd() : } /*! + Destroys the QUmlMessageEnd. + */ +QUmlMessageEnd::~QUmlMessageEnd() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlMessageEnd. */ QModelingElement *QUmlMessageEnd::clone() const @@ -76,14 +84,10 @@ QModelingElement *QUmlMessageEnd::clone() const QUmlMessageEnd *c = new QUmlMessageEnd; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (message()) - c->setMessage(dynamic_cast<QUmlMessage *>(message()->clone())); return c; } diff --git a/src/uml/qumlmessageend.h b/src/uml/qumlmessageend.h index 1a2dde88..35f4dedf 100644 --- a/src/uml/qumlmessageend.h +++ b/src/uml/qumlmessageend.h @@ -54,6 +54,8 @@ class QUmlMessage; class Q_UML_EXPORT QUmlMessageEnd : public virtual QUmlNamedElement { public: + virtual ~QUmlMessageEnd(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlmessageevent.cpp b/src/uml/qumlmessageevent.cpp index 1917f0c1..1c5dd98b 100644 --- a/src/uml/qumlmessageevent.cpp +++ b/src/uml/qumlmessageevent.cpp @@ -70,6 +70,14 @@ QUmlMessageEvent::QUmlMessageEvent() } /*! + Destroys the QUmlMessageEvent. + */ +QUmlMessageEvent::~QUmlMessageEvent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlMessageEvent. */ QModelingElement *QUmlMessageEvent::clone() const @@ -77,12 +85,6 @@ QModelingElement *QUmlMessageEvent::clone() const QUmlMessageEvent *c = new QUmlMessageEvent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlmessageevent.h b/src/uml/qumlmessageevent.h index f868c23b..98fb78a8 100644 --- a/src/uml/qumlmessageevent.h +++ b/src/uml/qumlmessageevent.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlMessageEvent : public QUmlEvent { public: + virtual ~QUmlMessageEvent(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmessageoccurrencespecification.cpp b/src/uml/qumlmessageoccurrencespecification.cpp index bb4bccf3..bdab217a 100644 --- a/src/uml/qumlmessageoccurrencespecification.cpp +++ b/src/uml/qumlmessageoccurrencespecification.cpp @@ -76,6 +76,14 @@ QUmlMessageOccurrenceSpecification::QUmlMessageOccurrenceSpecification(bool crea } /*! + Destroys the QUmlMessageOccurrenceSpecification. + */ +QUmlMessageOccurrenceSpecification::~QUmlMessageOccurrenceSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlMessageOccurrenceSpecification. */ QModelingElement *QUmlMessageOccurrenceSpecification::clone() const @@ -83,26 +91,12 @@ QModelingElement *QUmlMessageOccurrenceSpecification::clone() const QUmlMessageOccurrenceSpecification *c = new QUmlMessageOccurrenceSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (covered()) - c->setCovered(dynamic_cast<QUmlLifeline *>(covered()->clone())); - foreach (QUmlGeneralOrdering *element, toAfters()) - c->addToAfter(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - foreach (QUmlGeneralOrdering *element, toBefores()) - c->addToBefore(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (message()) - c->setMessage(dynamic_cast<QUmlMessage *>(message()->clone())); return c; } diff --git a/src/uml/qumlmessageoccurrencespecification.h b/src/uml/qumlmessageoccurrencespecification.h index a9441478..528c31f7 100644 --- a/src/uml/qumlmessageoccurrencespecification.h +++ b/src/uml/qumlmessageoccurrencespecification.h @@ -54,6 +54,7 @@ class Q_UML_EXPORT QUmlMessageOccurrenceSpecification : public QUmlOccurrenceSpe { public: explicit QUmlMessageOccurrenceSpecification(bool createQModelingObject = true); + virtual ~QUmlMessageOccurrenceSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmodel.cpp b/src/uml/qumlmodel.cpp index 10056722..15be8172 100644 --- a/src/uml/qumlmodel.cpp +++ b/src/uml/qumlmodel.cpp @@ -83,6 +83,14 @@ QUmlModel::QUmlModel(bool createQModelingObject) : } /*! + Destroys the QUmlModel. + */ +QUmlModel::~QUmlModel() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlModel. */ QModelingElement *QUmlModel::clone() const @@ -90,8 +98,6 @@ QModelingElement *QUmlModel::clone() const QUmlModel *c = new QUmlModel; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -101,18 +107,12 @@ QModelingElement *QUmlModel::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); if (ownedTemplateSignature()) c->setOwnedTemplateSignature(dynamic_cast<QUmlTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); c->setURI(URI()); - if (nestingPackage()) - c->setNestingPackage(dynamic_cast<QUmlPackage *>(nestingPackage()->clone())); foreach (QUmlPackageMerge *element, packageMerges()) c->addPackageMerge(dynamic_cast<QUmlPackageMerge *>(element->clone())); foreach (QUmlPackageableElement *element, packagedElements()) diff --git a/src/uml/qumlmodel.h b/src/uml/qumlmodel.h index 6e3558e3..8fa28738 100644 --- a/src/uml/qumlmodel.h +++ b/src/uml/qumlmodel.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlModel : public QUmlPackage { public: explicit QUmlModel(bool createQModelingObject = true); + virtual ~QUmlModel(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmultiplicityelement.cpp b/src/uml/qumlmultiplicityelement.cpp index 76438ba0..f9f5c44e 100644 --- a/src/uml/qumlmultiplicityelement.cpp +++ b/src/uml/qumlmultiplicityelement.cpp @@ -67,6 +67,14 @@ QUmlMultiplicityElement::QUmlMultiplicityElement() : } /*! + Destroys the QUmlMultiplicityElement. + */ +QUmlMultiplicityElement::~QUmlMultiplicityElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlMultiplicityElement. */ QModelingElement *QUmlMultiplicityElement::clone() const diff --git a/src/uml/qumlmultiplicityelement.h b/src/uml/qumlmultiplicityelement.h index 01e87272..716202cf 100644 --- a/src/uml/qumlmultiplicityelement.h +++ b/src/uml/qumlmultiplicityelement.h @@ -54,6 +54,8 @@ class QUmlValueSpecification; class Q_UML_EXPORT QUmlMultiplicityElement : public virtual QUmlElement { public: + virtual ~QUmlMultiplicityElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlnamedelement.cpp b/src/uml/qumlnamedelement.cpp index da134216..9b4d1eb6 100644 --- a/src/uml/qumlnamedelement.cpp +++ b/src/uml/qumlnamedelement.cpp @@ -69,6 +69,14 @@ QUmlNamedElement::QUmlNamedElement() : } /*! + Destroys the QUmlNamedElement. + */ +QUmlNamedElement::~QUmlNamedElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlNamedElement. */ QModelingElement *QUmlNamedElement::clone() const @@ -76,8 +84,6 @@ QModelingElement *QUmlNamedElement::clone() const QUmlNamedElement *c = new QUmlNamedElement; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlnamedelement.h b/src/uml/qumlnamedelement.h index 97b96506..ceae59bf 100644 --- a/src/uml/qumlnamedelement.h +++ b/src/uml/qumlnamedelement.h @@ -59,6 +59,8 @@ class QUmlStringExpression; class Q_UML_EXPORT QUmlNamedElement : public virtual QUmlElement { public: + virtual ~QUmlNamedElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlnamespace.cpp b/src/uml/qumlnamespace.cpp index 0691ea87..279b7a69 100644 --- a/src/uml/qumlnamespace.cpp +++ b/src/uml/qumlnamespace.cpp @@ -70,6 +70,14 @@ QUmlNamespace::QUmlNamespace() } /*! + Destroys the QUmlNamespace. + */ +QUmlNamespace::~QUmlNamespace() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlNamespace. */ QModelingElement *QUmlNamespace::clone() const @@ -77,8 +85,6 @@ QModelingElement *QUmlNamespace::clone() const QUmlNamespace *c = new QUmlNamespace; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlnamespace.h b/src/uml/qumlnamespace.h index 98849e4e..82333029 100644 --- a/src/uml/qumlnamespace.h +++ b/src/uml/qumlnamespace.h @@ -57,6 +57,8 @@ class QUmlPackageImport; class Q_UML_EXPORT QUmlNamespace : public virtual QUmlNamedElement { public: + virtual ~QUmlNamespace(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlnode.cpp b/src/uml/qumlnode.cpp index 2ebe1762..3ccac6fd 100644 --- a/src/uml/qumlnode.cpp +++ b/src/uml/qumlnode.cpp @@ -100,6 +100,14 @@ QUmlNode::QUmlNode(bool createQModelingObject) : } /*! + Destroys the QUmlNode. + */ +QUmlNode::~QUmlNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlNode. */ QModelingElement *QUmlNode::clone() const @@ -107,8 +115,6 @@ QModelingElement *QUmlNode::clone() const QUmlNode *c = new QUmlNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -118,11 +124,7 @@ QModelingElement *QUmlNode::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -135,22 +137,10 @@ QModelingElement *QUmlNode::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumlnode.h b/src/uml/qumlnode.h index 68be88c4..ece93aff 100644 --- a/src/uml/qumlnode.h +++ b/src/uml/qumlnode.h @@ -54,6 +54,7 @@ class Q_UML_EXPORT QUmlNode : public QUmlClass, public QUmlDeploymentTarget { public: explicit QUmlNode(bool createQModelingObject = true); + virtual ~QUmlNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlobjectflow.cpp b/src/uml/qumlobjectflow.cpp index ad12bbf7..f5cfd18a 100644 --- a/src/uml/qumlobjectflow.cpp +++ b/src/uml/qumlobjectflow.cpp @@ -84,6 +84,14 @@ QUmlObjectFlow::QUmlObjectFlow(bool createQModelingObject) : } /*! + Destroys the QUmlObjectFlow. + */ +QUmlObjectFlow::~QUmlObjectFlow() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlObjectFlow. */ QModelingElement *QUmlObjectFlow::clone() const @@ -91,37 +99,17 @@ QModelingElement *QUmlObjectFlow::clone() const QUmlObjectFlow *c = new QUmlObjectFlow; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); if (guard()) c->setGuard(dynamic_cast<QUmlValueSpecification *>(guard()->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - if (interrupts()) - c->setInterrupts(dynamic_cast<QUmlInterruptibleActivityRegion *>(interrupts()->clone())); - foreach (QUmlActivityEdge *element, redefinedEdges()) - c->addRedefinedEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); - if (source()) - c->setSource(dynamic_cast<QUmlActivityNode *>(source()->clone())); - if (target()) - c->setTarget(dynamic_cast<QUmlActivityNode *>(target()->clone())); if (weight()) c->setWeight(dynamic_cast<QUmlValueSpecification *>(weight()->clone())); c->setMulticast(isMulticast()); c->setMultireceive(isMultireceive()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); - if (transformation()) - c->setTransformation(dynamic_cast<QUmlBehavior *>(transformation()->clone())); return c; } diff --git a/src/uml/qumlobjectflow.h b/src/uml/qumlobjectflow.h index f0bfb0e8..5a876171 100644 --- a/src/uml/qumlobjectflow.h +++ b/src/uml/qumlobjectflow.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlObjectFlow : public QUmlActivityEdge { public: explicit QUmlObjectFlow(bool createQModelingObject = true); + virtual ~QUmlObjectFlow(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlobjectnode.cpp b/src/uml/qumlobjectnode.cpp index 05dc2364..b3879f11 100644 --- a/src/uml/qumlobjectnode.cpp +++ b/src/uml/qumlobjectnode.cpp @@ -84,6 +84,14 @@ QUmlObjectNode::QUmlObjectNode() : } /*! + Destroys the QUmlObjectNode. + */ +QUmlObjectNode::~QUmlObjectNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlObjectNode. */ QModelingElement *QUmlObjectNode::clone() const @@ -91,35 +99,13 @@ QModelingElement *QUmlObjectNode::clone() const QUmlObjectNode *c = new QUmlObjectNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); return c; diff --git a/src/uml/qumlobjectnode.h b/src/uml/qumlobjectnode.h index 0acccd0c..0c7afa6e 100644 --- a/src/uml/qumlobjectnode.h +++ b/src/uml/qumlobjectnode.h @@ -59,6 +59,8 @@ class QUmlValueSpecification; class Q_UML_EXPORT QUmlObjectNode : public QUmlActivityNode, public QUmlTypedElement { public: + virtual ~QUmlObjectNode(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlobservation.cpp b/src/uml/qumlobservation.cpp index 986d4ea9..b9f1bc71 100644 --- a/src/uml/qumlobservation.cpp +++ b/src/uml/qumlobservation.cpp @@ -70,6 +70,14 @@ QUmlObservation::QUmlObservation() } /*! + Destroys the QUmlObservation. + */ +QUmlObservation::~QUmlObservation() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlObservation. */ QModelingElement *QUmlObservation::clone() const @@ -77,12 +85,6 @@ QModelingElement *QUmlObservation::clone() const QUmlObservation *c = new QUmlObservation; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlobservation.h b/src/uml/qumlobservation.h index 41ee9494..5a7373a3 100644 --- a/src/uml/qumlobservation.h +++ b/src/uml/qumlobservation.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlObservation : public QUmlPackageableElement { public: + virtual ~QUmlObservation(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumloccurrencespecification.cpp b/src/uml/qumloccurrencespecification.cpp index cf18dc04..603e7d85 100644 --- a/src/uml/qumloccurrencespecification.cpp +++ b/src/uml/qumloccurrencespecification.cpp @@ -75,6 +75,14 @@ QUmlOccurrenceSpecification::QUmlOccurrenceSpecification(bool createQModelingObj } /*! + Destroys the QUmlOccurrenceSpecification. + */ +QUmlOccurrenceSpecification::~QUmlOccurrenceSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlOccurrenceSpecification. */ QModelingElement *QUmlOccurrenceSpecification::clone() const @@ -82,24 +90,12 @@ QModelingElement *QUmlOccurrenceSpecification::clone() const QUmlOccurrenceSpecification *c = new QUmlOccurrenceSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (covered()) - c->setCovered(dynamic_cast<QUmlLifeline *>(covered()->clone())); - foreach (QUmlGeneralOrdering *element, toAfters()) - c->addToAfter(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - foreach (QUmlGeneralOrdering *element, toBefores()) - c->addToBefore(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); return c; } diff --git a/src/uml/qumloccurrencespecification.h b/src/uml/qumloccurrencespecification.h index 5dfce7a9..e88e635b 100644 --- a/src/uml/qumloccurrencespecification.h +++ b/src/uml/qumloccurrencespecification.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlOccurrenceSpecification : public QUmlInteractionFragment { public: explicit QUmlOccurrenceSpecification(bool createQModelingObject = true); + virtual ~QUmlOccurrenceSpecification(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlopaqueaction.cpp b/src/uml/qumlopaqueaction.cpp index 34e6fcdb..cafd0a73 100644 --- a/src/uml/qumlopaqueaction.cpp +++ b/src/uml/qumlopaqueaction.cpp @@ -83,6 +83,14 @@ QUmlOpaqueAction::QUmlOpaqueAction(bool createQModelingObject) } /*! + Destroys the QUmlOpaqueAction. + */ +QUmlOpaqueAction::~QUmlOpaqueAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlOpaqueAction. */ QModelingElement *QUmlOpaqueAction::clone() const @@ -90,27 +98,11 @@ QModelingElement *QUmlOpaqueAction::clone() const QUmlOpaqueAction *c = new QUmlOpaqueAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlopaqueaction.h b/src/uml/qumlopaqueaction.h index 32d36df2..37a47d93 100644 --- a/src/uml/qumlopaqueaction.h +++ b/src/uml/qumlopaqueaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlOpaqueAction : public QUmlAction { public: explicit QUmlOpaqueAction(bool createQModelingObject = true); + virtual ~QUmlOpaqueAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlopaquebehavior.cpp b/src/uml/qumlopaquebehavior.cpp index 2c3bda26..ca885bc9 100644 --- a/src/uml/qumlopaquebehavior.cpp +++ b/src/uml/qumlopaquebehavior.cpp @@ -102,6 +102,14 @@ QUmlOpaqueBehavior::QUmlOpaqueBehavior(bool createQModelingObject) } /*! + Destroys the QUmlOpaqueBehavior. + */ +QUmlOpaqueBehavior::~QUmlOpaqueBehavior() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlOpaqueBehavior. */ QModelingElement *QUmlOpaqueBehavior::clone() const @@ -109,8 +117,6 @@ QModelingElement *QUmlOpaqueBehavior::clone() const QUmlOpaqueBehavior *c = new QUmlOpaqueBehavior; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -120,11 +126,7 @@ QModelingElement *QUmlOpaqueBehavior::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -137,22 +139,10 @@ QModelingElement *QUmlOpaqueBehavior::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -176,10 +166,6 @@ QModelingElement *QUmlOpaqueBehavior::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - foreach (QUmlBehavior *element, redefinedBehaviors()) - c->addRedefinedBehavior(dynamic_cast<QUmlBehavior *>(element->clone())); - if (specification()) - c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone())); foreach (QString element, bodies()) c->addBody(element); foreach (QString element, languages()) diff --git a/src/uml/qumlopaquebehavior.h b/src/uml/qumlopaquebehavior.h index af911853..7771fe13 100644 --- a/src/uml/qumlopaquebehavior.h +++ b/src/uml/qumlopaquebehavior.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlOpaqueBehavior : public QUmlBehavior { public: explicit QUmlOpaqueBehavior(bool createQModelingObject = true); + virtual ~QUmlOpaqueBehavior(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlopaqueexpression.cpp b/src/uml/qumlopaqueexpression.cpp index 03cb0acd..b12b4302 100644 --- a/src/uml/qumlopaqueexpression.cpp +++ b/src/uml/qumlopaqueexpression.cpp @@ -76,6 +76,14 @@ QUmlOpaqueExpression::QUmlOpaqueExpression(bool createQModelingObject) : } /*! + Destroys the QUmlOpaqueExpression. + */ +QUmlOpaqueExpression::~QUmlOpaqueExpression() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlOpaqueExpression. */ QModelingElement *QUmlOpaqueExpression::clone() const @@ -83,20 +91,10 @@ QModelingElement *QUmlOpaqueExpression::clone() const QUmlOpaqueExpression *c = new QUmlOpaqueExpression; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); - if (behavior()) - c->setBehavior(dynamic_cast<QUmlBehavior *>(behavior()->clone())); foreach (QString element, bodies()) c->addBody(element); foreach (QString element, languages()) diff --git a/src/uml/qumlopaqueexpression.h b/src/uml/qumlopaqueexpression.h index d352c838..876c775e 100644 --- a/src/uml/qumlopaqueexpression.h +++ b/src/uml/qumlopaqueexpression.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlOpaqueExpression : public QUmlValueSpecification { public: explicit QUmlOpaqueExpression(bool createQModelingObject = true); + virtual ~QUmlOpaqueExpression(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumloperation.cpp b/src/uml/qumloperation.cpp index d8378f79..2e140198 100644 --- a/src/uml/qumloperation.cpp +++ b/src/uml/qumloperation.cpp @@ -93,6 +93,14 @@ QUmlOperation::QUmlOperation(bool createQModelingObject) : } /*! + Destroys the QUmlOperation. + */ +QUmlOperation::~QUmlOperation() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlOperation. */ QModelingElement *QUmlOperation::clone() const @@ -104,8 +112,6 @@ QModelingElement *QUmlOperation::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -120,20 +126,10 @@ QModelingElement *QUmlOperation::clone() const c->setStatic(isStatic()); c->setConcurrency(concurrency()); c->setAbstract(isAbstract()); - foreach (QUmlBehavior *element, methods()) - c->addMethod(dynamic_cast<QUmlBehavior *>(element->clone())); foreach (QUmlParameterSet *element, ownedParameterSets()) c->addOwnedParameterSet(dynamic_cast<QUmlParameterSet *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); if (bodyCondition()) c->setBodyCondition(dynamic_cast<QUmlConstraint *>(bodyCondition()->clone())); - if (class_()) - c->setClass(dynamic_cast<QUmlClass *>(class_()->clone())); - if (datatype()) - c->setDatatype(dynamic_cast<QUmlDataType *>(datatype()->clone())); - if (interface_()) - c->setInterface(dynamic_cast<QUmlInterface *>(interface_()->clone())); c->setQuery(isQuery()); foreach (QUmlParameter *element, ownedParameters()) c->addOwnedParameter(dynamic_cast<QUmlParameter *>(element->clone())); @@ -141,12 +137,6 @@ QModelingElement *QUmlOperation::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - foreach (QUmlType *element, raisedExceptions()) - c->addRaisedException(dynamic_cast<QUmlType *>(element->clone())); - foreach (QUmlOperation *element, redefinedOperations()) - c->addRedefinedOperation(dynamic_cast<QUmlOperation *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlOperationTemplateParameter *>(templateParameter()->clone())); return c; } diff --git a/src/uml/qumloperation.h b/src/uml/qumloperation.h index 73a650f3..a3fbed9a 100644 --- a/src/uml/qumloperation.h +++ b/src/uml/qumloperation.h @@ -64,6 +64,7 @@ class Q_UML_EXPORT QUmlOperation : public QUmlTemplateableElement, public QUmlBe { public: explicit QUmlOperation(bool createQModelingObject = true); + virtual ~QUmlOperation(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumloperationtemplateparameter.cpp b/src/uml/qumloperationtemplateparameter.cpp index be83561f..d1b76220 100644 --- a/src/uml/qumloperationtemplateparameter.cpp +++ b/src/uml/qumloperationtemplateparameter.cpp @@ -70,6 +70,14 @@ QUmlOperationTemplateParameter::QUmlOperationTemplateParameter(bool createQModel } /*! + Destroys the QUmlOperationTemplateParameter. + */ +QUmlOperationTemplateParameter::~QUmlOperationTemplateParameter() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlOperationTemplateParameter. */ QModelingElement *QUmlOperationTemplateParameter::clone() const @@ -77,16 +85,10 @@ QModelingElement *QUmlOperationTemplateParameter::clone() const QUmlOperationTemplateParameter *c = new QUmlOperationTemplateParameter; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (default_()) - c->setDefault(dynamic_cast<QUmlParameterableElement *>(default_()->clone())); if (ownedDefault()) c->setOwnedDefault(dynamic_cast<QUmlParameterableElement *>(ownedDefault()->clone())); if (ownedParameteredElement()) c->setOwnedParameteredElement(dynamic_cast<QUmlParameterableElement *>(ownedParameteredElement()->clone())); - if (signature()) - c->setSignature(dynamic_cast<QUmlTemplateSignature *>(signature()->clone())); - if (parameteredElement()) - c->setParameteredElement(dynamic_cast<QUmlOperation *>(parameteredElement()->clone())); return c; } diff --git a/src/uml/qumloperationtemplateparameter.h b/src/uml/qumloperationtemplateparameter.h index ff27189d..2c4c477d 100644 --- a/src/uml/qumloperationtemplateparameter.h +++ b/src/uml/qumloperationtemplateparameter.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlOperationTemplateParameter : public QUmlTemplateParameter { public: explicit QUmlOperationTemplateParameter(bool createQModelingObject = true); + virtual ~QUmlOperationTemplateParameter(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumloutputpin.cpp b/src/uml/qumloutputpin.cpp index 19e9bd82..778895a9 100644 --- a/src/uml/qumloutputpin.cpp +++ b/src/uml/qumloutputpin.cpp @@ -84,6 +84,14 @@ QUmlOutputPin::QUmlOutputPin(bool createQModelingObject) } /*! + Destroys the QUmlOutputPin. + */ +QUmlOutputPin::~QUmlOutputPin() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlOutputPin. */ QModelingElement *QUmlOutputPin::clone() const @@ -97,35 +105,13 @@ QModelingElement *QUmlOutputPin::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); c->setControl(isControl()); diff --git a/src/uml/qumloutputpin.h b/src/uml/qumloutputpin.h index c79b1f6a..e8f69262 100644 --- a/src/uml/qumloutputpin.h +++ b/src/uml/qumloutputpin.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlOutputPin : public QUmlPin { public: explicit QUmlOutputPin(bool createQModelingObject = true); + virtual ~QUmlOutputPin(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlpackage.cpp b/src/uml/qumlpackage.cpp index 931ed763..c969212d 100644 --- a/src/uml/qumlpackage.cpp +++ b/src/uml/qumlpackage.cpp @@ -81,6 +81,14 @@ QUmlPackage::QUmlPackage(bool createQModelingObject) : } /*! + Destroys the QUmlPackage. + */ +QUmlPackage::~QUmlPackage() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPackage. */ QModelingElement *QUmlPackage::clone() const @@ -88,8 +96,6 @@ QModelingElement *QUmlPackage::clone() const QUmlPackage *c = new QUmlPackage; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -99,18 +105,12 @@ QModelingElement *QUmlPackage::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); if (ownedTemplateSignature()) c->setOwnedTemplateSignature(dynamic_cast<QUmlTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); c->setURI(URI()); - if (nestingPackage()) - c->setNestingPackage(dynamic_cast<QUmlPackage *>(nestingPackage()->clone())); foreach (QUmlPackageMerge *element, packageMerges()) c->addPackageMerge(dynamic_cast<QUmlPackageMerge *>(element->clone())); foreach (QUmlPackageableElement *element, packagedElements()) diff --git a/src/uml/qumlpackage.h b/src/uml/qumlpackage.h index 1a4ae431..67306ef3 100644 --- a/src/uml/qumlpackage.h +++ b/src/uml/qumlpackage.h @@ -62,6 +62,7 @@ class Q_UML_EXPORT QUmlPackage : public QUmlNamespace, public QUmlPackageableEle { public: explicit QUmlPackage(bool createQModelingObject = true); + virtual ~QUmlPackage(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlpackageableelement.cpp b/src/uml/qumlpackageableelement.cpp index c0fcd5e0..cf4a603c 100644 --- a/src/uml/qumlpackageableelement.cpp +++ b/src/uml/qumlpackageableelement.cpp @@ -69,6 +69,14 @@ QUmlPackageableElement::QUmlPackageableElement() : } /*! + Destroys the QUmlPackageableElement. + */ +QUmlPackageableElement::~QUmlPackageableElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPackageableElement. */ QModelingElement *QUmlPackageableElement::clone() const @@ -76,12 +84,6 @@ QModelingElement *QUmlPackageableElement::clone() const QUmlPackageableElement *c = new QUmlPackageableElement; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlpackageableelement.h b/src/uml/qumlpackageableelement.h index 7563572e..fc3a0ba6 100644 --- a/src/uml/qumlpackageableelement.h +++ b/src/uml/qumlpackageableelement.h @@ -55,6 +55,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlPackageableElement : public QUmlParameterableElement, public virtual QUmlNamedElement { public: + virtual ~QUmlPackageableElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlpackageimport.cpp b/src/uml/qumlpackageimport.cpp index cb8d1fb2..bde15820 100644 --- a/src/uml/qumlpackageimport.cpp +++ b/src/uml/qumlpackageimport.cpp @@ -70,6 +70,14 @@ QUmlPackageImport::QUmlPackageImport(bool createQModelingObject) : } /*! + Destroys the QUmlPackageImport. + */ +QUmlPackageImport::~QUmlPackageImport() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPackageImport. */ QModelingElement *QUmlPackageImport::clone() const @@ -77,10 +85,6 @@ QModelingElement *QUmlPackageImport::clone() const QUmlPackageImport *c = new QUmlPackageImport; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (importedPackage()) - c->setImportedPackage(dynamic_cast<QUmlPackage *>(importedPackage()->clone())); - if (importingNamespace()) - c->setImportingNamespace(dynamic_cast<QUmlNamespace *>(importingNamespace()->clone())); c->setVisibility(visibility()); return c; } diff --git a/src/uml/qumlpackageimport.h b/src/uml/qumlpackageimport.h index 967b3f7e..fb5d56ac 100644 --- a/src/uml/qumlpackageimport.h +++ b/src/uml/qumlpackageimport.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlPackageImport : public QUmlDirectedRelationship { public: explicit QUmlPackageImport(bool createQModelingObject = true); + virtual ~QUmlPackageImport(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlpackagemerge.cpp b/src/uml/qumlpackagemerge.cpp index 78fe22ba..4c7dd5a6 100644 --- a/src/uml/qumlpackagemerge.cpp +++ b/src/uml/qumlpackagemerge.cpp @@ -68,6 +68,14 @@ QUmlPackageMerge::QUmlPackageMerge(bool createQModelingObject) : } /*! + Destroys the QUmlPackageMerge. + */ +QUmlPackageMerge::~QUmlPackageMerge() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPackageMerge. */ QModelingElement *QUmlPackageMerge::clone() const @@ -75,10 +83,6 @@ QModelingElement *QUmlPackageMerge::clone() const QUmlPackageMerge *c = new QUmlPackageMerge; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (mergedPackage()) - c->setMergedPackage(dynamic_cast<QUmlPackage *>(mergedPackage()->clone())); - if (receivingPackage()) - c->setReceivingPackage(dynamic_cast<QUmlPackage *>(receivingPackage()->clone())); return c; } diff --git a/src/uml/qumlpackagemerge.h b/src/uml/qumlpackagemerge.h index eb4def32..f95059a1 100644 --- a/src/uml/qumlpackagemerge.h +++ b/src/uml/qumlpackagemerge.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlPackageMerge : public QUmlDirectedRelationship { public: explicit QUmlPackageMerge(bool createQModelingObject = true); + virtual ~QUmlPackageMerge(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlparameter.cpp b/src/uml/qumlparameter.cpp index 58e77f62..ede76539 100644 --- a/src/uml/qumlparameter.cpp +++ b/src/uml/qumlparameter.cpp @@ -84,6 +84,14 @@ QUmlParameter::QUmlParameter(bool createQModelingObject) : } /*! + Destroys the QUmlParameter. + */ +QUmlParameter::~QUmlParameter() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlParameter. */ QModelingElement *QUmlParameter::clone() const @@ -97,28 +105,16 @@ QModelingElement *QUmlParameter::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlConnectableElementTemplateParameter *>(templateParameter()->clone())); if (defaultValue()) c->setDefaultValue(dynamic_cast<QUmlValueSpecification *>(defaultValue()->clone())); c->setDirection(direction()); c->setEffect(effect()); c->setException(isException()); c->setStream(isStream()); - if (operation()) - c->setOperation(dynamic_cast<QUmlOperation *>(operation()->clone())); - foreach (QUmlParameterSet *element, parameterSets()) - c->addParameterSet(dynamic_cast<QUmlParameterSet *>(element->clone())); return c; } diff --git a/src/uml/qumlparameter.h b/src/uml/qumlparameter.h index 07d2789f..16c6a4d4 100644 --- a/src/uml/qumlparameter.h +++ b/src/uml/qumlparameter.h @@ -60,6 +60,7 @@ class Q_UML_EXPORT QUmlParameter : public QUmlMultiplicityElement, public QUmlCo { public: explicit QUmlParameter(bool createQModelingObject = true); + virtual ~QUmlParameter(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlparameterableelement.cpp b/src/uml/qumlparameterableelement.cpp index 34d059f3..fd188157 100644 --- a/src/uml/qumlparameterableelement.cpp +++ b/src/uml/qumlparameterableelement.cpp @@ -65,6 +65,14 @@ QUmlParameterableElement::QUmlParameterableElement() : } /*! + Destroys the QUmlParameterableElement. + */ +QUmlParameterableElement::~QUmlParameterableElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlParameterableElement. */ QModelingElement *QUmlParameterableElement::clone() const @@ -72,10 +80,6 @@ QModelingElement *QUmlParameterableElement::clone() const QUmlParameterableElement *c = new QUmlParameterableElement; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); return c; } diff --git a/src/uml/qumlparameterableelement.h b/src/uml/qumlparameterableelement.h index 73658939..08d5c2ab 100644 --- a/src/uml/qumlparameterableelement.h +++ b/src/uml/qumlparameterableelement.h @@ -54,6 +54,8 @@ class QUmlTemplateParameter; class Q_UML_EXPORT QUmlParameterableElement : public virtual QUmlElement { public: + virtual ~QUmlParameterableElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlparameterset.cpp b/src/uml/qumlparameterset.cpp index b8486fa5..e48356c6 100644 --- a/src/uml/qumlparameterset.cpp +++ b/src/uml/qumlparameterset.cpp @@ -71,6 +71,14 @@ QUmlParameterSet::QUmlParameterSet(bool createQModelingObject) } /*! + Destroys the QUmlParameterSet. + */ +QUmlParameterSet::~QUmlParameterSet() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlParameterSet. */ QModelingElement *QUmlParameterSet::clone() const @@ -78,16 +86,12 @@ QModelingElement *QUmlParameterSet::clone() const QUmlParameterSet *c = new QUmlParameterSet; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); foreach (QUmlConstraint *element, conditions()) c->addCondition(dynamic_cast<QUmlConstraint *>(element->clone())); - foreach (QUmlParameter *element, parameters()) - c->addParameter(dynamic_cast<QUmlParameter *>(element->clone())); return c; } diff --git a/src/uml/qumlparameterset.h b/src/uml/qumlparameterset.h index 580f3ca7..c156d168 100644 --- a/src/uml/qumlparameterset.h +++ b/src/uml/qumlparameterset.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlParameterSet : public QUmlNamedElement { public: explicit QUmlParameterSet(bool createQModelingObject = true); + virtual ~QUmlParameterSet(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlpartdecomposition.cpp b/src/uml/qumlpartdecomposition.cpp index e39db906..559d363f 100644 --- a/src/uml/qumlpartdecomposition.cpp +++ b/src/uml/qumlpartdecomposition.cpp @@ -78,6 +78,14 @@ QUmlPartDecomposition::QUmlPartDecomposition(bool createQModelingObject) : } /*! + Destroys the QUmlPartDecomposition. + */ +QUmlPartDecomposition::~QUmlPartDecomposition() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPartDecomposition. */ QModelingElement *QUmlPartDecomposition::clone() const @@ -85,30 +93,18 @@ QModelingElement *QUmlPartDecomposition::clone() const QUmlPartDecomposition *c = new QUmlPartDecomposition; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlLifeline *element, covered()) - c->addCovered(dynamic_cast<QUmlLifeline *>(element->clone())); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); foreach (QUmlGate *element, actualGates()) c->addActualGate(dynamic_cast<QUmlGate *>(element->clone())); foreach (QUmlValueSpecification *element, arguments()) c->addArgument(dynamic_cast<QUmlValueSpecification *>(element->clone())); - if (refersTo()) - c->setRefersTo(dynamic_cast<QUmlInteraction *>(refersTo()->clone())); if (returnValue()) c->setReturnValue(dynamic_cast<QUmlValueSpecification *>(returnValue()->clone())); - if (returnValueRecipient()) - c->setReturnValueRecipient(dynamic_cast<QUmlProperty *>(returnValueRecipient()->clone())); return c; } diff --git a/src/uml/qumlpartdecomposition.h b/src/uml/qumlpartdecomposition.h index 88db101d..dc360530 100644 --- a/src/uml/qumlpartdecomposition.h +++ b/src/uml/qumlpartdecomposition.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlPartDecomposition : public QUmlInteractionUse { public: explicit QUmlPartDecomposition(bool createQModelingObject = true); + virtual ~QUmlPartDecomposition(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlpin.cpp b/src/uml/qumlpin.cpp index 9fdec196..39ef1e06 100644 --- a/src/uml/qumlpin.cpp +++ b/src/uml/qumlpin.cpp @@ -82,6 +82,14 @@ QUmlPin::QUmlPin() : } /*! + Destroys the QUmlPin. + */ +QUmlPin::~QUmlPin() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPin. */ QModelingElement *QUmlPin::clone() const @@ -95,35 +103,13 @@ QModelingElement *QUmlPin::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); c->setControl(isControl()); diff --git a/src/uml/qumlpin.h b/src/uml/qumlpin.h index 37e49f1b..9023b3a8 100644 --- a/src/uml/qumlpin.h +++ b/src/uml/qumlpin.h @@ -53,6 +53,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlPin : public QUmlMultiplicityElement, public QUmlObjectNode { public: + virtual ~QUmlPin(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlport.cpp b/src/uml/qumlport.cpp index 517c33d5..943894d7 100644 --- a/src/uml/qumlport.cpp +++ b/src/uml/qumlport.cpp @@ -94,6 +94,14 @@ QUmlPort::QUmlPort(bool createQModelingObject) : } /*! + Destroys the QUmlPort. + */ +QUmlPort::~QUmlPort() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPort. */ QModelingElement *QUmlPort::clone() const @@ -101,14 +109,10 @@ QModelingElement *QUmlPort::clone() const QUmlPort *c = new QUmlPort; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); c->setOrdered(isOrdered()); c->setUnique(isUnique()); if (lowerValue()) @@ -117,44 +121,20 @@ QModelingElement *QUmlPort::clone() const c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); c->setLeaf(isLeaf()); c->setStatic(isStatic()); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlConnectableElementTemplateParameter *>(templateParameter()->clone())); foreach (QUmlDeployment *element, deployments()) c->addDeployment(dynamic_cast<QUmlDeployment *>(element->clone())); c->setAggregation(aggregation()); - if (association()) - c->setAssociation(dynamic_cast<QUmlAssociation *>(association()->clone())); - if (associationEnd()) - c->setAssociationEnd(dynamic_cast<QUmlProperty *>(associationEnd()->clone())); - if (class_()) - c->setClass(dynamic_cast<QUmlClass *>(class_()->clone())); - if (datatype()) - c->setDatatype(dynamic_cast<QUmlDataType *>(datatype()->clone())); if (defaultValue()) c->setDefaultValue(dynamic_cast<QUmlValueSpecification *>(defaultValue()->clone())); - if (interface_()) - c->setInterface(dynamic_cast<QUmlInterface *>(interface_()->clone())); c->setDerived(isDerived()); c->setDerivedUnion(isDerivedUnion()); c->setID(isID()); c->setReadOnly(isReadOnly()); - if (owningAssociation()) - c->setOwningAssociation(dynamic_cast<QUmlAssociation *>(owningAssociation()->clone())); foreach (QUmlProperty *element, qualifiers()) c->addQualifier(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, redefinedProperties()) - c->addRedefinedProperty(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, subsettedProperties()) - c->addSubsettedProperty(dynamic_cast<QUmlProperty *>(element->clone())); c->setBehavior(isBehavior()); c->setConjugated(isConjugated()); c->setService(isService()); - if (protocol()) - c->setProtocol(dynamic_cast<QUmlProtocolStateMachine *>(protocol()->clone())); - foreach (QUmlPort *element, redefinedPorts()) - c->addRedefinedPort(dynamic_cast<QUmlPort *>(element->clone())); return c; } diff --git a/src/uml/qumlport.h b/src/uml/qumlport.h index dbaf387f..9205a1c3 100644 --- a/src/uml/qumlport.h +++ b/src/uml/qumlport.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlPort : public QUmlProperty { public: explicit QUmlPort(bool createQModelingObject = true); + virtual ~QUmlPort(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlprimitivetype.cpp b/src/uml/qumlprimitivetype.cpp index 60309335..b11dd67d 100644 --- a/src/uml/qumlprimitivetype.cpp +++ b/src/uml/qumlprimitivetype.cpp @@ -92,6 +92,14 @@ QUmlPrimitiveType::QUmlPrimitiveType(bool createQModelingObject) : } /*! + Destroys the QUmlPrimitiveType. + */ +QUmlPrimitiveType::~QUmlPrimitiveType() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPrimitiveType. */ QModelingElement *QUmlPrimitiveType::clone() const @@ -99,8 +107,6 @@ QModelingElement *QUmlPrimitiveType::clone() const QUmlPrimitiveType *c = new QUmlPrimitiveType; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -110,11 +116,7 @@ QModelingElement *QUmlPrimitiveType::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -128,18 +130,8 @@ QModelingElement *QUmlPrimitiveType::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlOperation *element, ownedOperations()) diff --git a/src/uml/qumlprimitivetype.h b/src/uml/qumlprimitivetype.h index 53bf80d2..8dd3c0b4 100644 --- a/src/uml/qumlprimitivetype.h +++ b/src/uml/qumlprimitivetype.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlPrimitiveType : public QUmlDataType { public: explicit QUmlPrimitiveType(bool createQModelingObject = true); + virtual ~QUmlPrimitiveType(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlprofile.cpp b/src/uml/qumlprofile.cpp index 30dce22f..4d2fb93a 100644 --- a/src/uml/qumlprofile.cpp +++ b/src/uml/qumlprofile.cpp @@ -82,6 +82,14 @@ QUmlProfile::QUmlProfile(bool createQModelingObject) : } /*! + Destroys the QUmlProfile. + */ +QUmlProfile::~QUmlProfile() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlProfile. */ QModelingElement *QUmlProfile::clone() const @@ -89,8 +97,6 @@ QModelingElement *QUmlProfile::clone() const QUmlProfile *c = new QUmlProfile; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -100,18 +106,12 @@ QModelingElement *QUmlProfile::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); if (ownedTemplateSignature()) c->setOwnedTemplateSignature(dynamic_cast<QUmlTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); c->setURI(URI()); - if (nestingPackage()) - c->setNestingPackage(dynamic_cast<QUmlPackage *>(nestingPackage()->clone())); foreach (QUmlPackageMerge *element, packageMerges()) c->addPackageMerge(dynamic_cast<QUmlPackageMerge *>(element->clone())); foreach (QUmlPackageableElement *element, packagedElements()) diff --git a/src/uml/qumlprofile.h b/src/uml/qumlprofile.h index 69de3ede..e137cd4c 100644 --- a/src/uml/qumlprofile.h +++ b/src/uml/qumlprofile.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlProfile : public QUmlPackage { public: explicit QUmlProfile(bool createQModelingObject = true); + virtual ~QUmlProfile(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlprofileapplication.cpp b/src/uml/qumlprofileapplication.cpp index 46ba18c7..8e765037 100644 --- a/src/uml/qumlprofileapplication.cpp +++ b/src/uml/qumlprofileapplication.cpp @@ -70,6 +70,14 @@ QUmlProfileApplication::QUmlProfileApplication(bool createQModelingObject) : } /*! + Destroys the QUmlProfileApplication. + */ +QUmlProfileApplication::~QUmlProfileApplication() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlProfileApplication. */ QModelingElement *QUmlProfileApplication::clone() const @@ -77,10 +85,6 @@ QModelingElement *QUmlProfileApplication::clone() const QUmlProfileApplication *c = new QUmlProfileApplication; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (appliedProfile()) - c->setAppliedProfile(dynamic_cast<QUmlProfile *>(appliedProfile()->clone())); - if (applyingPackage()) - c->setApplyingPackage(dynamic_cast<QUmlPackage *>(applyingPackage()->clone())); c->setStrict(isStrict()); return c; } diff --git a/src/uml/qumlprofileapplication.h b/src/uml/qumlprofileapplication.h index 52c7ff32..a1f18da7 100644 --- a/src/uml/qumlprofileapplication.h +++ b/src/uml/qumlprofileapplication.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlProfileApplication : public QUmlDirectedRelationship { public: explicit QUmlProfileApplication(bool createQModelingObject = true); + virtual ~QUmlProfileApplication(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlproperty.cpp b/src/uml/qumlproperty.cpp index a926e608..cf481efc 100644 --- a/src/uml/qumlproperty.cpp +++ b/src/uml/qumlproperty.cpp @@ -97,6 +97,14 @@ QUmlProperty::QUmlProperty(bool createQModelingObject) : } /*! + Destroys the QUmlProperty. + */ +QUmlProperty::~QUmlProperty() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlProperty. */ QModelingElement *QUmlProperty::clone() const @@ -104,14 +112,10 @@ QModelingElement *QUmlProperty::clone() const QUmlProperty *c = new QUmlProperty; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); c->setOrdered(isOrdered()); c->setUnique(isUnique()); if (lowerValue()) @@ -120,37 +124,17 @@ QModelingElement *QUmlProperty::clone() const c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); c->setLeaf(isLeaf()); c->setStatic(isStatic()); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlConnectableElementTemplateParameter *>(templateParameter()->clone())); foreach (QUmlDeployment *element, deployments()) c->addDeployment(dynamic_cast<QUmlDeployment *>(element->clone())); c->setAggregation(aggregation()); - if (association()) - c->setAssociation(dynamic_cast<QUmlAssociation *>(association()->clone())); - if (associationEnd()) - c->setAssociationEnd(dynamic_cast<QUmlProperty *>(associationEnd()->clone())); - if (class_()) - c->setClass(dynamic_cast<QUmlClass *>(class_()->clone())); - if (datatype()) - c->setDatatype(dynamic_cast<QUmlDataType *>(datatype()->clone())); if (defaultValue()) c->setDefaultValue(dynamic_cast<QUmlValueSpecification *>(defaultValue()->clone())); - if (interface_()) - c->setInterface(dynamic_cast<QUmlInterface *>(interface_()->clone())); c->setDerived(isDerived()); c->setDerivedUnion(isDerivedUnion()); c->setID(isID()); c->setReadOnly(isReadOnly()); - if (owningAssociation()) - c->setOwningAssociation(dynamic_cast<QUmlAssociation *>(owningAssociation()->clone())); foreach (QUmlProperty *element, qualifiers()) c->addQualifier(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, redefinedProperties()) - c->addRedefinedProperty(dynamic_cast<QUmlProperty *>(element->clone())); - foreach (QUmlProperty *element, subsettedProperties()) - c->addSubsettedProperty(dynamic_cast<QUmlProperty *>(element->clone())); return c; } diff --git a/src/uml/qumlproperty.h b/src/uml/qumlproperty.h index f07bd339..29c7f5b3 100644 --- a/src/uml/qumlproperty.h +++ b/src/uml/qumlproperty.h @@ -66,6 +66,7 @@ class Q_UML_EXPORT QUmlProperty : public QUmlStructuralFeature, public QUmlConne { public: explicit QUmlProperty(bool createQModelingObject = true); + virtual ~QUmlProperty(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlprotocolconformance.cpp b/src/uml/qumlprotocolconformance.cpp index 4fab39bd..da273f5c 100644 --- a/src/uml/qumlprotocolconformance.cpp +++ b/src/uml/qumlprotocolconformance.cpp @@ -68,6 +68,14 @@ QUmlProtocolConformance::QUmlProtocolConformance(bool createQModelingObject) : } /*! + Destroys the QUmlProtocolConformance. + */ +QUmlProtocolConformance::~QUmlProtocolConformance() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlProtocolConformance. */ QModelingElement *QUmlProtocolConformance::clone() const @@ -75,10 +83,6 @@ QModelingElement *QUmlProtocolConformance::clone() const QUmlProtocolConformance *c = new QUmlProtocolConformance; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (generalMachine()) - c->setGeneralMachine(dynamic_cast<QUmlProtocolStateMachine *>(generalMachine()->clone())); - if (specificMachine()) - c->setSpecificMachine(dynamic_cast<QUmlProtocolStateMachine *>(specificMachine()->clone())); return c; } diff --git a/src/uml/qumlprotocolconformance.h b/src/uml/qumlprotocolconformance.h index be73de2b..362f4e82 100644 --- a/src/uml/qumlprotocolconformance.h +++ b/src/uml/qumlprotocolconformance.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlProtocolConformance : public QUmlDirectedRelationship { public: explicit QUmlProtocolConformance(bool createQModelingObject = true); + virtual ~QUmlProtocolConformance(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlprotocolstatemachine.cpp b/src/uml/qumlprotocolstatemachine.cpp index a4e1e7d6..a648dab1 100644 --- a/src/uml/qumlprotocolstatemachine.cpp +++ b/src/uml/qumlprotocolstatemachine.cpp @@ -108,6 +108,14 @@ QUmlProtocolStateMachine::QUmlProtocolStateMachine(bool createQModelingObject) : } /*! + Destroys the QUmlProtocolStateMachine. + */ +QUmlProtocolStateMachine::~QUmlProtocolStateMachine() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlProtocolStateMachine. */ QModelingElement *QUmlProtocolStateMachine::clone() const @@ -115,8 +123,6 @@ QModelingElement *QUmlProtocolStateMachine::clone() const QUmlProtocolStateMachine *c = new QUmlProtocolStateMachine; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -126,11 +132,7 @@ QModelingElement *QUmlProtocolStateMachine::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -143,22 +145,10 @@ QModelingElement *QUmlProtocolStateMachine::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -182,16 +172,10 @@ QModelingElement *QUmlProtocolStateMachine::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (specification()) - c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone())); foreach (QUmlPseudostate *element, connectionPoints()) c->addConnectionPoint(dynamic_cast<QUmlPseudostate *>(element->clone())); - foreach (QUmlStateMachine *element, extendedStateMachines()) - c->addExtendedStateMachine(dynamic_cast<QUmlStateMachine *>(element->clone())); foreach (QUmlRegion *element, regions()) c->addRegion(dynamic_cast<QUmlRegion *>(element->clone())); - foreach (QUmlState *element, submachineStates()) - c->addSubmachineState(dynamic_cast<QUmlState *>(element->clone())); foreach (QUmlProtocolConformance *element, conformance()) c->addConformance(dynamic_cast<QUmlProtocolConformance *>(element->clone())); return c; diff --git a/src/uml/qumlprotocolstatemachine.h b/src/uml/qumlprotocolstatemachine.h index 3eff14a6..72f8630a 100644 --- a/src/uml/qumlprotocolstatemachine.h +++ b/src/uml/qumlprotocolstatemachine.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlProtocolStateMachine : public QUmlStateMachine { public: explicit QUmlProtocolStateMachine(bool createQModelingObject = true); + virtual ~QUmlProtocolStateMachine(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlprotocoltransition.cpp b/src/uml/qumlprotocoltransition.cpp index ccb15eee..3aa6b99b 100644 --- a/src/uml/qumlprotocoltransition.cpp +++ b/src/uml/qumlprotocoltransition.cpp @@ -85,6 +85,14 @@ QUmlProtocolTransition::QUmlProtocolTransition(bool createQModelingObject) : } /*! + Destroys the QUmlProtocolTransition. + */ +QUmlProtocolTransition::~QUmlProtocolTransition() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlProtocolTransition. */ QModelingElement *QUmlProtocolTransition::clone() const @@ -92,8 +100,6 @@ QModelingElement *QUmlProtocolTransition::clone() const QUmlProtocolTransition *c = new QUmlProtocolTransition; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -105,19 +111,11 @@ QModelingElement *QUmlProtocolTransition::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (container()) - c->setContainer(dynamic_cast<QUmlRegion *>(container()->clone())); if (effect()) c->setEffect(dynamic_cast<QUmlBehavior *>(effect()->clone())); if (guard()) c->setGuard(dynamic_cast<QUmlConstraint *>(guard()->clone())); c->setKind(kind()); - if (redefinedTransition()) - c->setRedefinedTransition(dynamic_cast<QUmlTransition *>(redefinedTransition()->clone())); - if (source()) - c->setSource(dynamic_cast<QUmlVertex *>(source()->clone())); - if (target()) - c->setTarget(dynamic_cast<QUmlVertex *>(target()->clone())); foreach (QUmlTrigger *element, triggers()) c->addTrigger(dynamic_cast<QUmlTrigger *>(element->clone())); if (postCondition()) diff --git a/src/uml/qumlprotocoltransition.h b/src/uml/qumlprotocoltransition.h index ee729ba4..94add7ce 100644 --- a/src/uml/qumlprotocoltransition.h +++ b/src/uml/qumlprotocoltransition.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlProtocolTransition : public QUmlTransition { public: explicit QUmlProtocolTransition(bool createQModelingObject = true); + virtual ~QUmlProtocolTransition(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlpseudostate.cpp b/src/uml/qumlpseudostate.cpp index 8017337b..0e44b0af 100644 --- a/src/uml/qumlpseudostate.cpp +++ b/src/uml/qumlpseudostate.cpp @@ -77,6 +77,14 @@ QUmlPseudostate::QUmlPseudostate(bool createQModelingObject) : } /*! + Destroys the QUmlPseudostate. + */ +QUmlPseudostate::~QUmlPseudostate() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlPseudostate. */ QModelingElement *QUmlPseudostate::clone() const @@ -84,19 +92,11 @@ QModelingElement *QUmlPseudostate::clone() const QUmlPseudostate *c = new QUmlPseudostate; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (container()) - c->setContainer(dynamic_cast<QUmlRegion *>(container()->clone())); c->setKind(kind()); - if (state()) - c->setState(dynamic_cast<QUmlState *>(state()->clone())); - if (stateMachine()) - c->setStateMachine(dynamic_cast<QUmlStateMachine *>(stateMachine()->clone())); return c; } diff --git a/src/uml/qumlpseudostate.h b/src/uml/qumlpseudostate.h index 6805bee9..23edb9ec 100644 --- a/src/uml/qumlpseudostate.h +++ b/src/uml/qumlpseudostate.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlPseudostate : public QUmlVertex { public: explicit QUmlPseudostate(bool createQModelingObject = true); + virtual ~QUmlPseudostate(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlqualifiervalue.cpp b/src/uml/qumlqualifiervalue.cpp index 258d2837..226c6917 100644 --- a/src/uml/qumlqualifiervalue.cpp +++ b/src/uml/qumlqualifiervalue.cpp @@ -68,6 +68,14 @@ QUmlQualifierValue::QUmlQualifierValue(bool createQModelingObject) : } /*! + Destroys the QUmlQualifierValue. + */ +QUmlQualifierValue::~QUmlQualifierValue() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlQualifierValue. */ QModelingElement *QUmlQualifierValue::clone() const @@ -75,10 +83,6 @@ QModelingElement *QUmlQualifierValue::clone() const QUmlQualifierValue *c = new QUmlQualifierValue; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (qualifier()) - c->setQualifier(dynamic_cast<QUmlProperty *>(qualifier()->clone())); - if (value()) - c->setValue(dynamic_cast<QUmlInputPin *>(value()->clone())); return c; } diff --git a/src/uml/qumlqualifiervalue.h b/src/uml/qumlqualifiervalue.h index 20e3bf16..1dd11273 100644 --- a/src/uml/qumlqualifiervalue.h +++ b/src/uml/qumlqualifiervalue.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlQualifierValue : public QUmlElement { public: explicit QUmlQualifierValue(bool createQModelingObject = true); + virtual ~QUmlQualifierValue(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlraiseexceptionaction.cpp b/src/uml/qumlraiseexceptionaction.cpp index 838d31ca..15aa913f 100644 --- a/src/uml/qumlraiseexceptionaction.cpp +++ b/src/uml/qumlraiseexceptionaction.cpp @@ -84,6 +84,14 @@ QUmlRaiseExceptionAction::QUmlRaiseExceptionAction(bool createQModelingObject) : } /*! + Destroys the QUmlRaiseExceptionAction. + */ +QUmlRaiseExceptionAction::~QUmlRaiseExceptionAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRaiseExceptionAction. */ QModelingElement *QUmlRaiseExceptionAction::clone() const @@ -91,27 +99,11 @@ QModelingElement *QUmlRaiseExceptionAction::clone() const QUmlRaiseExceptionAction *c = new QUmlRaiseExceptionAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlraiseexceptionaction.h b/src/uml/qumlraiseexceptionaction.h index 7a808ec4..fd7035e6 100644 --- a/src/uml/qumlraiseexceptionaction.h +++ b/src/uml/qumlraiseexceptionaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlRaiseExceptionAction : public QUmlAction { public: explicit QUmlRaiseExceptionAction(bool createQModelingObject = true); + virtual ~QUmlRaiseExceptionAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadextentaction.cpp b/src/uml/qumlreadextentaction.cpp index 4fb6114d..6b0195b8 100644 --- a/src/uml/qumlreadextentaction.cpp +++ b/src/uml/qumlreadextentaction.cpp @@ -85,6 +85,14 @@ QUmlReadExtentAction::QUmlReadExtentAction(bool createQModelingObject) : } /*! + Destroys the QUmlReadExtentAction. + */ +QUmlReadExtentAction::~QUmlReadExtentAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadExtentAction. */ QModelingElement *QUmlReadExtentAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlReadExtentAction::clone() const QUmlReadExtentAction *c = new QUmlReadExtentAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -120,8 +112,6 @@ QModelingElement *QUmlReadExtentAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (classifier()) - c->setClassifier(dynamic_cast<QUmlClassifier *>(classifier()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); return c; diff --git a/src/uml/qumlreadextentaction.h b/src/uml/qumlreadextentaction.h index bf273eb1..324a41a6 100644 --- a/src/uml/qumlreadextentaction.h +++ b/src/uml/qumlreadextentaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlReadExtentAction : public QUmlAction { public: explicit QUmlReadExtentAction(bool createQModelingObject = true); + virtual ~QUmlReadExtentAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadisclassifiedobjectaction.cpp b/src/uml/qumlreadisclassifiedobjectaction.cpp index 3e873d1a..268e8b3e 100644 --- a/src/uml/qumlreadisclassifiedobjectaction.cpp +++ b/src/uml/qumlreadisclassifiedobjectaction.cpp @@ -87,6 +87,14 @@ QUmlReadIsClassifiedObjectAction::QUmlReadIsClassifiedObjectAction(bool createQM } /*! + Destroys the QUmlReadIsClassifiedObjectAction. + */ +QUmlReadIsClassifiedObjectAction::~QUmlReadIsClassifiedObjectAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadIsClassifiedObjectAction. */ QModelingElement *QUmlReadIsClassifiedObjectAction::clone() const @@ -94,27 +102,11 @@ QModelingElement *QUmlReadIsClassifiedObjectAction::clone() const QUmlReadIsClassifiedObjectAction *c = new QUmlReadIsClassifiedObjectAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -122,8 +114,6 @@ QModelingElement *QUmlReadIsClassifiedObjectAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (classifier()) - c->setClassifier(dynamic_cast<QUmlClassifier *>(classifier()->clone())); c->setDirect(isDirect()); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); diff --git a/src/uml/qumlreadisclassifiedobjectaction.h b/src/uml/qumlreadisclassifiedobjectaction.h index 05891b6f..6c05d648 100644 --- a/src/uml/qumlreadisclassifiedobjectaction.h +++ b/src/uml/qumlreadisclassifiedobjectaction.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlReadIsClassifiedObjectAction : public QUmlAction { public: explicit QUmlReadIsClassifiedObjectAction(bool createQModelingObject = true); + virtual ~QUmlReadIsClassifiedObjectAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadlinkaction.cpp b/src/uml/qumlreadlinkaction.cpp index ac12ae77..a2eaca9f 100644 --- a/src/uml/qumlreadlinkaction.cpp +++ b/src/uml/qumlreadlinkaction.cpp @@ -86,6 +86,14 @@ QUmlReadLinkAction::QUmlReadLinkAction(bool createQModelingObject) : } /*! + Destroys the QUmlReadLinkAction. + */ +QUmlReadLinkAction::~QUmlReadLinkAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadLinkAction. */ QModelingElement *QUmlReadLinkAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlReadLinkAction::clone() const QUmlReadLinkAction *c = new QUmlReadLinkAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlreadlinkaction.h b/src/uml/qumlreadlinkaction.h index 6c110573..fa44bb11 100644 --- a/src/uml/qumlreadlinkaction.h +++ b/src/uml/qumlreadlinkaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlReadLinkAction : public QUmlLinkAction { public: explicit QUmlReadLinkAction(bool createQModelingObject = true); + virtual ~QUmlReadLinkAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadlinkobjectendaction.cpp b/src/uml/qumlreadlinkobjectendaction.cpp index 20670c42..543f973a 100644 --- a/src/uml/qumlreadlinkobjectendaction.cpp +++ b/src/uml/qumlreadlinkobjectendaction.cpp @@ -87,6 +87,14 @@ QUmlReadLinkObjectEndAction::QUmlReadLinkObjectEndAction(bool createQModelingObj } /*! + Destroys the QUmlReadLinkObjectEndAction. + */ +QUmlReadLinkObjectEndAction::~QUmlReadLinkObjectEndAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadLinkObjectEndAction. */ QModelingElement *QUmlReadLinkObjectEndAction::clone() const @@ -94,27 +102,11 @@ QModelingElement *QUmlReadLinkObjectEndAction::clone() const QUmlReadLinkObjectEndAction *c = new QUmlReadLinkObjectEndAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -122,8 +114,6 @@ QModelingElement *QUmlReadLinkObjectEndAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (end()) - c->setEnd(dynamic_cast<QUmlProperty *>(end()->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); if (result()) diff --git a/src/uml/qumlreadlinkobjectendaction.h b/src/uml/qumlreadlinkobjectendaction.h index fd56520c..f754c8fe 100644 --- a/src/uml/qumlreadlinkobjectendaction.h +++ b/src/uml/qumlreadlinkobjectendaction.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndAction : public QUmlAction { public: explicit QUmlReadLinkObjectEndAction(bool createQModelingObject = true); + virtual ~QUmlReadLinkObjectEndAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.cpp b/src/uml/qumlreadlinkobjectendqualifieraction.cpp index 145aa9db..a45071eb 100644 --- a/src/uml/qumlreadlinkobjectendqualifieraction.cpp +++ b/src/uml/qumlreadlinkobjectendqualifieraction.cpp @@ -87,6 +87,14 @@ QUmlReadLinkObjectEndQualifierAction::QUmlReadLinkObjectEndQualifierAction(bool } /*! + Destroys the QUmlReadLinkObjectEndQualifierAction. + */ +QUmlReadLinkObjectEndQualifierAction::~QUmlReadLinkObjectEndQualifierAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadLinkObjectEndQualifierAction. */ QModelingElement *QUmlReadLinkObjectEndQualifierAction::clone() const @@ -94,27 +102,11 @@ QModelingElement *QUmlReadLinkObjectEndQualifierAction::clone() const QUmlReadLinkObjectEndQualifierAction *c = new QUmlReadLinkObjectEndQualifierAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -124,8 +116,6 @@ QModelingElement *QUmlReadLinkObjectEndQualifierAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - if (qualifier()) - c->setQualifier(dynamic_cast<QUmlProperty *>(qualifier()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); return c; diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.h b/src/uml/qumlreadlinkobjectendqualifieraction.h index 9d6144e0..56cf2eeb 100644 --- a/src/uml/qumlreadlinkobjectendqualifieraction.h +++ b/src/uml/qumlreadlinkobjectendqualifieraction.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierAction : public QUmlAction { public: explicit QUmlReadLinkObjectEndQualifierAction(bool createQModelingObject = true); + virtual ~QUmlReadLinkObjectEndQualifierAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadselfaction.cpp b/src/uml/qumlreadselfaction.cpp index ddf9c10c..edc5c969 100644 --- a/src/uml/qumlreadselfaction.cpp +++ b/src/uml/qumlreadselfaction.cpp @@ -84,6 +84,14 @@ QUmlReadSelfAction::QUmlReadSelfAction(bool createQModelingObject) : } /*! + Destroys the QUmlReadSelfAction. + */ +QUmlReadSelfAction::~QUmlReadSelfAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadSelfAction. */ QModelingElement *QUmlReadSelfAction::clone() const @@ -91,27 +99,11 @@ QModelingElement *QUmlReadSelfAction::clone() const QUmlReadSelfAction *c = new QUmlReadSelfAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlreadselfaction.h b/src/uml/qumlreadselfaction.h index 9211b6fe..586f9cc7 100644 --- a/src/uml/qumlreadselfaction.h +++ b/src/uml/qumlreadselfaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlReadSelfAction : public QUmlAction { public: explicit QUmlReadSelfAction(bool createQModelingObject = true); + virtual ~QUmlReadSelfAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadstructuralfeatureaction.cpp b/src/uml/qumlreadstructuralfeatureaction.cpp index 60e22683..fdb799aa 100644 --- a/src/uml/qumlreadstructuralfeatureaction.cpp +++ b/src/uml/qumlreadstructuralfeatureaction.cpp @@ -85,6 +85,14 @@ QUmlReadStructuralFeatureAction::QUmlReadStructuralFeatureAction(bool createQMod } /*! + Destroys the QUmlReadStructuralFeatureAction. + */ +QUmlReadStructuralFeatureAction::~QUmlReadStructuralFeatureAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadStructuralFeatureAction. */ QModelingElement *QUmlReadStructuralFeatureAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlReadStructuralFeatureAction::clone() const QUmlReadStructuralFeatureAction *c = new QUmlReadStructuralFeatureAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -122,8 +114,6 @@ QModelingElement *QUmlReadStructuralFeatureAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - if (structuralFeature()) - c->setStructuralFeature(dynamic_cast<QUmlStructuralFeature *>(structuralFeature()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); return c; diff --git a/src/uml/qumlreadstructuralfeatureaction.h b/src/uml/qumlreadstructuralfeatureaction.h index 1b593608..3faecb44 100644 --- a/src/uml/qumlreadstructuralfeatureaction.h +++ b/src/uml/qumlreadstructuralfeatureaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlReadStructuralFeatureAction : public QUmlStructuralFeatur { public: explicit QUmlReadStructuralFeatureAction(bool createQModelingObject = true); + virtual ~QUmlReadStructuralFeatureAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreadvariableaction.cpp b/src/uml/qumlreadvariableaction.cpp index be333b72..b2666c66 100644 --- a/src/uml/qumlreadvariableaction.cpp +++ b/src/uml/qumlreadvariableaction.cpp @@ -85,6 +85,14 @@ QUmlReadVariableAction::QUmlReadVariableAction(bool createQModelingObject) : } /*! + Destroys the QUmlReadVariableAction. + */ +QUmlReadVariableAction::~QUmlReadVariableAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReadVariableAction. */ QModelingElement *QUmlReadVariableAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlReadVariableAction::clone() const QUmlReadVariableAction *c = new QUmlReadVariableAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -120,8 +112,6 @@ QModelingElement *QUmlReadVariableAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (variable()) - c->setVariable(dynamic_cast<QUmlVariable *>(variable()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); return c; diff --git a/src/uml/qumlreadvariableaction.h b/src/uml/qumlreadvariableaction.h index 3baaeb3b..0098f0a8 100644 --- a/src/uml/qumlreadvariableaction.h +++ b/src/uml/qumlreadvariableaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlReadVariableAction : public QUmlVariableAction { public: explicit QUmlReadVariableAction(bool createQModelingObject = true); + virtual ~QUmlReadVariableAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlrealization.cpp b/src/uml/qumlrealization.cpp index bf6e157d..7d00149b 100644 --- a/src/uml/qumlrealization.cpp +++ b/src/uml/qumlrealization.cpp @@ -74,6 +74,14 @@ QUmlRealization::QUmlRealization(bool createQModelingObject) : } /*! + Destroys the QUmlRealization. + */ +QUmlRealization::~QUmlRealization() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRealization. */ QModelingElement *QUmlRealization::clone() const @@ -81,20 +89,10 @@ QModelingElement *QUmlRealization::clone() const QUmlRealization *c = new QUmlRealization; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); if (mapping()) c->setMapping(dynamic_cast<QUmlOpaqueExpression *>(mapping()->clone())); return c; diff --git a/src/uml/qumlrealization.h b/src/uml/qumlrealization.h index 885e1152..2aa0168a 100644 --- a/src/uml/qumlrealization.h +++ b/src/uml/qumlrealization.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlRealization : public QUmlAbstraction { public: explicit QUmlRealization(bool createQModelingObject = true); + virtual ~QUmlRealization(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreception.cpp b/src/uml/qumlreception.cpp index 1b32ac68..2a41a329 100644 --- a/src/uml/qumlreception.cpp +++ b/src/uml/qumlreception.cpp @@ -82,6 +82,14 @@ QUmlReception::QUmlReception(bool createQModelingObject) : } /*! + Destroys the QUmlReception. + */ +QUmlReception::~QUmlReception() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReception. */ QModelingElement *QUmlReception::clone() const @@ -89,8 +97,6 @@ QModelingElement *QUmlReception::clone() const QUmlReception *c = new QUmlReception; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -105,16 +111,10 @@ QModelingElement *QUmlReception::clone() const c->setStatic(isStatic()); c->setConcurrency(concurrency()); c->setAbstract(isAbstract()); - foreach (QUmlBehavior *element, methods()) - c->addMethod(dynamic_cast<QUmlBehavior *>(element->clone())); foreach (QUmlParameter *element, ownedParameters()) c->addOwnedParameter(dynamic_cast<QUmlParameter *>(element->clone())); foreach (QUmlParameterSet *element, ownedParameterSets()) c->addOwnedParameterSet(dynamic_cast<QUmlParameterSet *>(element->clone())); - foreach (QUmlType *element, raisedExceptions()) - c->addRaisedException(dynamic_cast<QUmlType *>(element->clone())); - if (signal()) - c->setSignal(dynamic_cast<QUmlSignal *>(signal()->clone())); return c; } diff --git a/src/uml/qumlreception.h b/src/uml/qumlreception.h index f2362bb7..e6ac67e8 100644 --- a/src/uml/qumlreception.h +++ b/src/uml/qumlreception.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlReception : public QUmlBehavioralFeature { public: explicit QUmlReception(bool createQModelingObject = true); + virtual ~QUmlReception(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreclassifyobjectaction.cpp b/src/uml/qumlreclassifyobjectaction.cpp index 745e43f3..3df0a31b 100644 --- a/src/uml/qumlreclassifyobjectaction.cpp +++ b/src/uml/qumlreclassifyobjectaction.cpp @@ -85,6 +85,14 @@ QUmlReclassifyObjectAction::QUmlReclassifyObjectAction(bool createQModelingObjec } /*! + Destroys the QUmlReclassifyObjectAction. + */ +QUmlReclassifyObjectAction::~QUmlReclassifyObjectAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReclassifyObjectAction. */ QModelingElement *QUmlReclassifyObjectAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlReclassifyObjectAction::clone() const QUmlReclassifyObjectAction *c = new QUmlReclassifyObjectAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,12 +113,8 @@ QModelingElement *QUmlReclassifyObjectAction::clone() const foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); c->setReplaceAll(isReplaceAll()); - foreach (QUmlClassifier *element, newClassifiers()) - c->addNewClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - foreach (QUmlClassifier *element, oldClassifiers()) - c->addOldClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); return c; } diff --git a/src/uml/qumlreclassifyobjectaction.h b/src/uml/qumlreclassifyobjectaction.h index 8b201140..6af4d356 100644 --- a/src/uml/qumlreclassifyobjectaction.h +++ b/src/uml/qumlreclassifyobjectaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlReclassifyObjectAction : public QUmlAction { public: explicit QUmlReclassifyObjectAction(bool createQModelingObject = true); + virtual ~QUmlReclassifyObjectAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlredefinableelement.cpp b/src/uml/qumlredefinableelement.cpp index e958ea74..fbb755e4 100644 --- a/src/uml/qumlredefinableelement.cpp +++ b/src/uml/qumlredefinableelement.cpp @@ -69,6 +69,14 @@ QUmlRedefinableElement::QUmlRedefinableElement() : } /*! + Destroys the QUmlRedefinableElement. + */ +QUmlRedefinableElement::~QUmlRedefinableElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRedefinableElement. */ QModelingElement *QUmlRedefinableElement::clone() const @@ -76,8 +84,6 @@ QModelingElement *QUmlRedefinableElement::clone() const QUmlRedefinableElement *c = new QUmlRedefinableElement; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumlredefinableelement.h b/src/uml/qumlredefinableelement.h index bc7dac0b..07f05273 100644 --- a/src/uml/qumlredefinableelement.h +++ b/src/uml/qumlredefinableelement.h @@ -54,6 +54,8 @@ class QUmlClassifier; class Q_UML_EXPORT QUmlRedefinableElement : public virtual QUmlNamedElement { public: + virtual ~QUmlRedefinableElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlredefinabletemplatesignature.cpp b/src/uml/qumlredefinabletemplatesignature.cpp index 5d5e8b63..4e4aa0ad 100644 --- a/src/uml/qumlredefinabletemplatesignature.cpp +++ b/src/uml/qumlredefinabletemplatesignature.cpp @@ -75,6 +75,14 @@ QUmlRedefinableTemplateSignature::QUmlRedefinableTemplateSignature(bool createQM } /*! + Destroys the QUmlRedefinableTemplateSignature. + */ +QUmlRedefinableTemplateSignature::~QUmlRedefinableTemplateSignature() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRedefinableTemplateSignature. */ QModelingElement *QUmlRedefinableTemplateSignature::clone() const @@ -84,21 +92,11 @@ QModelingElement *QUmlRedefinableTemplateSignature::clone() const c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); foreach (QUmlTemplateParameter *element, ownedParameters()) c->addOwnedParameter(dynamic_cast<QUmlTemplateParameter *>(element->clone())); - foreach (QUmlTemplateParameter *element, parameters()) - c->addParameter(dynamic_cast<QUmlTemplateParameter *>(element->clone())); - if (template_()) - c->setTemplate(dynamic_cast<QUmlTemplateableElement *>(template_()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (classifier()) - c->setClassifier(dynamic_cast<QUmlClassifier *>(classifier()->clone())); - foreach (QUmlRedefinableTemplateSignature *element, extendedSignatures()) - c->addExtendedSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(element->clone())); return c; } diff --git a/src/uml/qumlredefinabletemplatesignature.h b/src/uml/qumlredefinabletemplatesignature.h index f406deb8..2a7cd8e9 100644 --- a/src/uml/qumlredefinabletemplatesignature.h +++ b/src/uml/qumlredefinabletemplatesignature.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlRedefinableTemplateSignature : public QUmlTemplateSignatu { public: explicit QUmlRedefinableTemplateSignature(bool createQModelingObject = true); + virtual ~QUmlRedefinableTemplateSignature(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreduceaction.cpp b/src/uml/qumlreduceaction.cpp index 0f037794..ee98cd8c 100644 --- a/src/uml/qumlreduceaction.cpp +++ b/src/uml/qumlreduceaction.cpp @@ -88,6 +88,14 @@ QUmlReduceAction::QUmlReduceAction(bool createQModelingObject) : } /*! + Destroys the QUmlReduceAction. + */ +QUmlReduceAction::~QUmlReduceAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReduceAction. */ QModelingElement *QUmlReduceAction::clone() const @@ -95,27 +103,11 @@ QModelingElement *QUmlReduceAction::clone() const QUmlReduceAction *c = new QUmlReduceAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -126,8 +118,6 @@ QModelingElement *QUmlReduceAction::clone() const if (collection()) c->setCollection(dynamic_cast<QUmlInputPin *>(collection()->clone())); c->setOrdered(isOrdered()); - if (reducer()) - c->setReducer(dynamic_cast<QUmlBehavior *>(reducer()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); return c; diff --git a/src/uml/qumlreduceaction.h b/src/uml/qumlreduceaction.h index 6386f80f..c267e2be 100644 --- a/src/uml/qumlreduceaction.h +++ b/src/uml/qumlreduceaction.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlReduceAction : public QUmlAction { public: explicit QUmlReduceAction(bool createQModelingObject = true); + virtual ~QUmlReduceAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlregion.cpp b/src/uml/qumlregion.cpp index ada846ef..26b528de 100644 --- a/src/uml/qumlregion.cpp +++ b/src/uml/qumlregion.cpp @@ -81,6 +81,14 @@ QUmlRegion::QUmlRegion(bool createQModelingObject) : } /*! + Destroys the QUmlRegion. + */ +QUmlRegion::~QUmlRegion() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRegion. */ QModelingElement *QUmlRegion::clone() const @@ -88,8 +96,6 @@ QModelingElement *QUmlRegion::clone() const QUmlRegion *c = new QUmlRegion; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -101,12 +107,6 @@ QModelingElement *QUmlRegion::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (extendedRegion()) - c->setExtendedRegion(dynamic_cast<QUmlRegion *>(extendedRegion()->clone())); - if (state()) - c->setState(dynamic_cast<QUmlState *>(state()->clone())); - if (stateMachine()) - c->setStateMachine(dynamic_cast<QUmlStateMachine *>(stateMachine()->clone())); foreach (QUmlVertex *element, subvertices()) c->addSubvertex(dynamic_cast<QUmlVertex *>(element->clone())); foreach (QUmlTransition *element, transitions()) diff --git a/src/uml/qumlregion.h b/src/uml/qumlregion.h index c5d88dea..a5311af1 100644 --- a/src/uml/qumlregion.h +++ b/src/uml/qumlregion.h @@ -60,6 +60,7 @@ class Q_UML_EXPORT QUmlRegion : public QUmlRedefinableElement, public QUmlNamesp { public: explicit QUmlRegion(bool createQModelingObject = true); + virtual ~QUmlRegion(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlrelationship.cpp b/src/uml/qumlrelationship.cpp index a9969485..1870bdc0 100644 --- a/src/uml/qumlrelationship.cpp +++ b/src/uml/qumlrelationship.cpp @@ -62,6 +62,14 @@ QUmlRelationship::QUmlRelationship() } /*! + Destroys the QUmlRelationship. + */ +QUmlRelationship::~QUmlRelationship() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRelationship. */ QModelingElement *QUmlRelationship::clone() const diff --git a/src/uml/qumlrelationship.h b/src/uml/qumlrelationship.h index 0cd9f6da..b095bec8 100644 --- a/src/uml/qumlrelationship.h +++ b/src/uml/qumlrelationship.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlRelationship : public virtual QUmlElement { public: + virtual ~QUmlRelationship(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.cpp b/src/uml/qumlremovestructuralfeaturevalueaction.cpp index d7ed933f..b6d539fc 100644 --- a/src/uml/qumlremovestructuralfeaturevalueaction.cpp +++ b/src/uml/qumlremovestructuralfeaturevalueaction.cpp @@ -86,6 +86,14 @@ QUmlRemoveStructuralFeatureValueAction::QUmlRemoveStructuralFeatureValueAction(b } /*! + Destroys the QUmlRemoveStructuralFeatureValueAction. + */ +QUmlRemoveStructuralFeatureValueAction::~QUmlRemoveStructuralFeatureValueAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRemoveStructuralFeatureValueAction. */ QModelingElement *QUmlRemoveStructuralFeatureValueAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlRemoveStructuralFeatureValueAction::clone() const QUmlRemoveStructuralFeatureValueAction *c = new QUmlRemoveStructuralFeatureValueAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -123,8 +115,6 @@ QModelingElement *QUmlRemoveStructuralFeatureValueAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - if (structuralFeature()) - c->setStructuralFeature(dynamic_cast<QUmlStructuralFeature *>(structuralFeature()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); if (value()) diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.h b/src/uml/qumlremovestructuralfeaturevalueaction.h index 220eb883..36a51837 100644 --- a/src/uml/qumlremovestructuralfeaturevalueaction.h +++ b/src/uml/qumlremovestructuralfeaturevalueaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueAction : public QUmlWriteStru { public: explicit QUmlRemoveStructuralFeatureValueAction(bool createQModelingObject = true); + virtual ~QUmlRemoveStructuralFeatureValueAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlremovevariablevalueaction.cpp b/src/uml/qumlremovevariablevalueaction.cpp index 2c455316..5d1e66ca 100644 --- a/src/uml/qumlremovevariablevalueaction.cpp +++ b/src/uml/qumlremovevariablevalueaction.cpp @@ -86,6 +86,14 @@ QUmlRemoveVariableValueAction::QUmlRemoveVariableValueAction(bool createQModelin } /*! + Destroys the QUmlRemoveVariableValueAction. + */ +QUmlRemoveVariableValueAction::~QUmlRemoveVariableValueAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlRemoveVariableValueAction. */ QModelingElement *QUmlRemoveVariableValueAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlRemoveVariableValueAction::clone() const QUmlRemoveVariableValueAction *c = new QUmlRemoveVariableValueAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,8 +113,6 @@ QModelingElement *QUmlRemoveVariableValueAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (variable()) - c->setVariable(dynamic_cast<QUmlVariable *>(variable()->clone())); if (value()) c->setValue(dynamic_cast<QUmlInputPin *>(value()->clone())); c->setRemoveDuplicates(isRemoveDuplicates()); diff --git a/src/uml/qumlremovevariablevalueaction.h b/src/uml/qumlremovevariablevalueaction.h index 305aa5ae..5005ddbf 100644 --- a/src/uml/qumlremovevariablevalueaction.h +++ b/src/uml/qumlremovevariablevalueaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlRemoveVariableValueAction : public QUmlWriteVariableActio { public: explicit QUmlRemoveVariableValueAction(bool createQModelingObject = true); + virtual ~QUmlRemoveVariableValueAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlreplyaction.cpp b/src/uml/qumlreplyaction.cpp index 45af8582..5a334fbe 100644 --- a/src/uml/qumlreplyaction.cpp +++ b/src/uml/qumlreplyaction.cpp @@ -86,6 +86,14 @@ QUmlReplyAction::QUmlReplyAction(bool createQModelingObject) : } /*! + Destroys the QUmlReplyAction. + */ +QUmlReplyAction::~QUmlReplyAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlReplyAction. */ QModelingElement *QUmlReplyAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlReplyAction::clone() const QUmlReplyAction *c = new QUmlReplyAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,8 +113,6 @@ QModelingElement *QUmlReplyAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (replyToCall()) - c->setReplyToCall(dynamic_cast<QUmlTrigger *>(replyToCall()->clone())); foreach (QUmlInputPin *element, replyValues()) c->addReplyValue(dynamic_cast<QUmlInputPin *>(element->clone())); if (returnInformation()) diff --git a/src/uml/qumlreplyaction.h b/src/uml/qumlreplyaction.h index 8cc78f94..53ab44ff 100644 --- a/src/uml/qumlreplyaction.h +++ b/src/uml/qumlreplyaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlReplyAction : public QUmlAction { public: explicit QUmlReplyAction(bool createQModelingObject = true); + virtual ~QUmlReplyAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlsendobjectaction.cpp b/src/uml/qumlsendobjectaction.cpp index 4b555feb..118485ac 100644 --- a/src/uml/qumlsendobjectaction.cpp +++ b/src/uml/qumlsendobjectaction.cpp @@ -86,6 +86,14 @@ QUmlSendObjectAction::QUmlSendObjectAction(bool createQModelingObject) : } /*! + Destroys the QUmlSendObjectAction. + */ +QUmlSendObjectAction::~QUmlSendObjectAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlSendObjectAction. */ QModelingElement *QUmlSendObjectAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlSendObjectAction::clone() const QUmlSendObjectAction *c = new QUmlSendObjectAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,8 +113,6 @@ QModelingElement *QUmlSendObjectAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); if (request()) c->setRequest(dynamic_cast<QUmlInputPin *>(request()->clone())); if (target()) diff --git a/src/uml/qumlsendobjectaction.h b/src/uml/qumlsendobjectaction.h index d24bee41..28bfa698 100644 --- a/src/uml/qumlsendobjectaction.h +++ b/src/uml/qumlsendobjectaction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlSendObjectAction : public QUmlInvocationAction { public: explicit QUmlSendObjectAction(bool createQModelingObject = true); + virtual ~QUmlSendObjectAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlsendsignalaction.cpp b/src/uml/qumlsendsignalaction.cpp index 1de9ca25..c04b3431 100644 --- a/src/uml/qumlsendsignalaction.cpp +++ b/src/uml/qumlsendsignalaction.cpp @@ -87,6 +87,14 @@ QUmlSendSignalAction::QUmlSendSignalAction(bool createQModelingObject) : } /*! + Destroys the QUmlSendSignalAction. + */ +QUmlSendSignalAction::~QUmlSendSignalAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlSendSignalAction. */ QModelingElement *QUmlSendSignalAction::clone() const @@ -94,27 +102,11 @@ QModelingElement *QUmlSendSignalAction::clone() const QUmlSendSignalAction *c = new QUmlSendSignalAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -124,10 +116,6 @@ QModelingElement *QUmlSendSignalAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlInputPin *element, arguments()) c->addArgument(dynamic_cast<QUmlInputPin *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); - if (signal()) - c->setSignal(dynamic_cast<QUmlSignal *>(signal()->clone())); if (target()) c->setTarget(dynamic_cast<QUmlInputPin *>(target()->clone())); return c; diff --git a/src/uml/qumlsendsignalaction.h b/src/uml/qumlsendsignalaction.h index c7121541..77013e7e 100644 --- a/src/uml/qumlsendsignalaction.h +++ b/src/uml/qumlsendsignalaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlSendSignalAction : public QUmlInvocationAction { public: explicit QUmlSendSignalAction(bool createQModelingObject = true); + virtual ~QUmlSendSignalAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlsequencenode.cpp b/src/uml/qumlsequencenode.cpp index 9c1e4e2c..c7312611 100644 --- a/src/uml/qumlsequencenode.cpp +++ b/src/uml/qumlsequencenode.cpp @@ -88,6 +88,14 @@ QUmlSequenceNode::QUmlSequenceNode(bool createQModelingObject) : } /*! + Destroys the QUmlSequenceNode. + */ +QUmlSequenceNode::~QUmlSequenceNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlSequenceNode. */ QModelingElement *QUmlSequenceNode::clone() const @@ -95,25 +103,11 @@ QModelingElement *QUmlSequenceNode::clone() const QUmlSequenceNode *c = new QUmlSequenceNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -127,8 +121,6 @@ QModelingElement *QUmlSequenceNode::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); foreach (QUmlActivityEdge *element, edges()) c->addEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); c->setMustIsolate(mustIsolate()); diff --git a/src/uml/qumlsequencenode.h b/src/uml/qumlsequencenode.h index a5bc5d8a..7c10142d 100644 --- a/src/uml/qumlsequencenode.h +++ b/src/uml/qumlsequencenode.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlSequenceNode : public QUmlStructuredActivityNode { public: explicit QUmlSequenceNode(bool createQModelingObject = true); + virtual ~QUmlSequenceNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlsignal.cpp b/src/uml/qumlsignal.cpp index 7d94391d..c4e3039f 100644 --- a/src/uml/qumlsignal.cpp +++ b/src/uml/qumlsignal.cpp @@ -89,6 +89,14 @@ QUmlSignal::QUmlSignal(bool createQModelingObject) } /*! + Destroys the QUmlSignal. + */ +QUmlSignal::~QUmlSignal() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlSignal. */ QModelingElement *QUmlSignal::clone() const @@ -96,8 +104,6 @@ QModelingElement *QUmlSignal::clone() const QUmlSignal *c = new QUmlSignal; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -107,11 +113,7 @@ QModelingElement *QUmlSignal::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -125,18 +127,8 @@ QModelingElement *QUmlSignal::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); return c; diff --git a/src/uml/qumlsignal.h b/src/uml/qumlsignal.h index a55cecbe..1e9c0012 100644 --- a/src/uml/qumlsignal.h +++ b/src/uml/qumlsignal.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlSignal : public QUmlClassifier { public: explicit QUmlSignal(bool createQModelingObject = true); + virtual ~QUmlSignal(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlsignalevent.cpp b/src/uml/qumlsignalevent.cpp index 1985c22e..7866b7bd 100644 --- a/src/uml/qumlsignalevent.cpp +++ b/src/uml/qumlsignalevent.cpp @@ -74,6 +74,14 @@ QUmlSignalEvent::QUmlSignalEvent(bool createQModelingObject) : } /*! + Destroys the QUmlSignalEvent. + */ +QUmlSignalEvent::~QUmlSignalEvent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlSignalEvent. */ QModelingElement *QUmlSignalEvent::clone() const @@ -81,18 +89,10 @@ QModelingElement *QUmlSignalEvent::clone() const QUmlSignalEvent *c = new QUmlSignalEvent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (signal()) - c->setSignal(dynamic_cast<QUmlSignal *>(signal()->clone())); return c; } diff --git a/src/uml/qumlsignalevent.h b/src/uml/qumlsignalevent.h index 52ffefe0..fed54be2 100644 --- a/src/uml/qumlsignalevent.h +++ b/src/uml/qumlsignalevent.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlSignalEvent : public QUmlMessageEvent { public: explicit QUmlSignalEvent(bool createQModelingObject = true); + virtual ~QUmlSignalEvent(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlslot.cpp b/src/uml/qumlslot.cpp index ff3c9be6..1c3dcc75 100644 --- a/src/uml/qumlslot.cpp +++ b/src/uml/qumlslot.cpp @@ -69,6 +69,14 @@ QUmlSlot::QUmlSlot(bool createQModelingObject) : } /*! + Destroys the QUmlSlot. + */ +QUmlSlot::~QUmlSlot() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlSlot. */ QModelingElement *QUmlSlot::clone() const @@ -76,10 +84,6 @@ QModelingElement *QUmlSlot::clone() const QUmlSlot *c = new QUmlSlot; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (definingFeature()) - c->setDefiningFeature(dynamic_cast<QUmlStructuralFeature *>(definingFeature()->clone())); - if (owningInstance()) - c->setOwningInstance(dynamic_cast<QUmlInstanceSpecification *>(owningInstance()->clone())); foreach (QUmlValueSpecification *element, values()) c->addValue(dynamic_cast<QUmlValueSpecification *>(element->clone())); return c; diff --git a/src/uml/qumlslot.h b/src/uml/qumlslot.h index 72df9dd6..461b2047 100644 --- a/src/uml/qumlslot.h +++ b/src/uml/qumlslot.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlSlot : public QUmlElement { public: explicit QUmlSlot(bool createQModelingObject = true); + virtual ~QUmlSlot(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstartclassifierbehavioraction.cpp b/src/uml/qumlstartclassifierbehavioraction.cpp index 650566cf..6aaf6501 100644 --- a/src/uml/qumlstartclassifierbehavioraction.cpp +++ b/src/uml/qumlstartclassifierbehavioraction.cpp @@ -84,6 +84,14 @@ QUmlStartClassifierBehaviorAction::QUmlStartClassifierBehaviorAction(bool create } /*! + Destroys the QUmlStartClassifierBehaviorAction. + */ +QUmlStartClassifierBehaviorAction::~QUmlStartClassifierBehaviorAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStartClassifierBehaviorAction. */ QModelingElement *QUmlStartClassifierBehaviorAction::clone() const @@ -91,27 +99,11 @@ QModelingElement *QUmlStartClassifierBehaviorAction::clone() const QUmlStartClassifierBehaviorAction *c = new QUmlStartClassifierBehaviorAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlstartclassifierbehavioraction.h b/src/uml/qumlstartclassifierbehavioraction.h index 9655fd08..abce11e0 100644 --- a/src/uml/qumlstartclassifierbehavioraction.h +++ b/src/uml/qumlstartclassifierbehavioraction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlStartClassifierBehaviorAction : public QUmlAction { public: explicit QUmlStartClassifierBehaviorAction(bool createQModelingObject = true); + virtual ~QUmlStartClassifierBehaviorAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstartobjectbehavioraction.cpp b/src/uml/qumlstartobjectbehavioraction.cpp index 570b81e9..aaf0b9a8 100644 --- a/src/uml/qumlstartobjectbehavioraction.cpp +++ b/src/uml/qumlstartobjectbehavioraction.cpp @@ -85,6 +85,14 @@ QUmlStartObjectBehaviorAction::QUmlStartObjectBehaviorAction(bool createQModelin } /*! + Destroys the QUmlStartObjectBehaviorAction. + */ +QUmlStartObjectBehaviorAction::~QUmlStartObjectBehaviorAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStartObjectBehaviorAction. */ QModelingElement *QUmlStartObjectBehaviorAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlStartObjectBehaviorAction::clone() const QUmlStartObjectBehaviorAction *c = new QUmlStartObjectBehaviorAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -122,8 +114,6 @@ QModelingElement *QUmlStartObjectBehaviorAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlInputPin *element, arguments()) c->addArgument(dynamic_cast<QUmlInputPin *>(element->clone())); - if (onPort()) - c->setOnPort(dynamic_cast<QUmlPort *>(onPort()->clone())); c->setSynchronous(isSynchronous()); foreach (QUmlOutputPin *element, results()) c->addResult(dynamic_cast<QUmlOutputPin *>(element->clone())); diff --git a/src/uml/qumlstartobjectbehavioraction.h b/src/uml/qumlstartobjectbehavioraction.h index 2da2f133..aa47931c 100644 --- a/src/uml/qumlstartobjectbehavioraction.h +++ b/src/uml/qumlstartobjectbehavioraction.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlStartObjectBehaviorAction : public QUmlCallAction { public: explicit QUmlStartObjectBehaviorAction(bool createQModelingObject = true); + virtual ~QUmlStartObjectBehaviorAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstate.cpp b/src/uml/qumlstate.cpp index 3c1fa870..4edda4e6 100644 --- a/src/uml/qumlstate.cpp +++ b/src/uml/qumlstate.cpp @@ -87,6 +87,14 @@ QUmlState::QUmlState(bool createQModelingObject) : } /*! + Destroys the QUmlState. + */ +QUmlState::~QUmlState() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlState. */ QModelingElement *QUmlState::clone() const @@ -94,8 +102,6 @@ QModelingElement *QUmlState::clone() const QUmlState *c = new QUmlState; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -107,8 +113,6 @@ QModelingElement *QUmlState::clone() const foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); c->setLeaf(isLeaf()); - if (container()) - c->setContainer(dynamic_cast<QUmlRegion *>(container()->clone())); foreach (QUmlConnectionPointReference *element, connections()) c->addConnection(dynamic_cast<QUmlConnectionPointReference *>(element->clone())); foreach (QUmlPseudostate *element, connectionPoints()) @@ -121,14 +125,10 @@ QModelingElement *QUmlState::clone() const c->setEntry(dynamic_cast<QUmlBehavior *>(entry()->clone())); if (exit()) c->setExit(dynamic_cast<QUmlBehavior *>(exit()->clone())); - if (redefinedState()) - c->setRedefinedState(dynamic_cast<QUmlState *>(redefinedState()->clone())); foreach (QUmlRegion *element, regions()) c->addRegion(dynamic_cast<QUmlRegion *>(element->clone())); if (stateInvariant()) c->setStateInvariant(dynamic_cast<QUmlConstraint *>(stateInvariant()->clone())); - if (submachine()) - c->setSubmachine(dynamic_cast<QUmlStateMachine *>(submachine()->clone())); return c; } diff --git a/src/uml/qumlstate.h b/src/uml/qumlstate.h index 2db8bfe9..362cda16 100644 --- a/src/uml/qumlstate.h +++ b/src/uml/qumlstate.h @@ -64,6 +64,7 @@ class Q_UML_EXPORT QUmlState : public QUmlNamespace, public QUmlRedefinableEleme { public: explicit QUmlState(bool createQModelingObject = true); + virtual ~QUmlState(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstateinvariant.cpp b/src/uml/qumlstateinvariant.cpp index be6bf730..5e2613d4 100644 --- a/src/uml/qumlstateinvariant.cpp +++ b/src/uml/qumlstateinvariant.cpp @@ -77,6 +77,14 @@ QUmlStateInvariant::QUmlStateInvariant(bool createQModelingObject) : } /*! + Destroys the QUmlStateInvariant. + */ +QUmlStateInvariant::~QUmlStateInvariant() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStateInvariant. */ QModelingElement *QUmlStateInvariant::clone() const @@ -84,20 +92,12 @@ QModelingElement *QUmlStateInvariant::clone() const QUmlStateInvariant *c = new QUmlStateInvariant; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (enclosingInteraction()) - c->setEnclosingInteraction(dynamic_cast<QUmlInteraction *>(enclosingInteraction()->clone())); - if (enclosingOperand()) - c->setEnclosingOperand(dynamic_cast<QUmlInteractionOperand *>(enclosingOperand()->clone())); foreach (QUmlGeneralOrdering *element, generalOrderings()) c->addGeneralOrdering(dynamic_cast<QUmlGeneralOrdering *>(element->clone())); - if (covered()) - c->setCovered(dynamic_cast<QUmlLifeline *>(covered()->clone())); if (invariant()) c->setInvariant(dynamic_cast<QUmlConstraint *>(invariant()->clone())); return c; diff --git a/src/uml/qumlstateinvariant.h b/src/uml/qumlstateinvariant.h index f0ee20fc..f639e71b 100644 --- a/src/uml/qumlstateinvariant.h +++ b/src/uml/qumlstateinvariant.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlStateInvariant : public QUmlInteractionFragment { public: explicit QUmlStateInvariant(bool createQModelingObject = true); + virtual ~QUmlStateInvariant(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstatemachine.cpp b/src/uml/qumlstatemachine.cpp index 2931059c..ffb641ab 100644 --- a/src/uml/qumlstatemachine.cpp +++ b/src/uml/qumlstatemachine.cpp @@ -105,6 +105,14 @@ QUmlStateMachine::QUmlStateMachine(bool createQModelingObject) } /*! + Destroys the QUmlStateMachine. + */ +QUmlStateMachine::~QUmlStateMachine() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStateMachine. */ QModelingElement *QUmlStateMachine::clone() const @@ -112,8 +120,6 @@ QModelingElement *QUmlStateMachine::clone() const QUmlStateMachine *c = new QUmlStateMachine; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -123,11 +129,7 @@ QModelingElement *QUmlStateMachine::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -140,22 +142,10 @@ QModelingElement *QUmlStateMachine::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -179,16 +169,10 @@ QModelingElement *QUmlStateMachine::clone() const c->addPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, preconditions()) c->addPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (specification()) - c->setSpecification(dynamic_cast<QUmlBehavioralFeature *>(specification()->clone())); foreach (QUmlPseudostate *element, connectionPoints()) c->addConnectionPoint(dynamic_cast<QUmlPseudostate *>(element->clone())); - foreach (QUmlStateMachine *element, extendedStateMachines()) - c->addExtendedStateMachine(dynamic_cast<QUmlStateMachine *>(element->clone())); foreach (QUmlRegion *element, regions()) c->addRegion(dynamic_cast<QUmlRegion *>(element->clone())); - foreach (QUmlState *element, submachineStates()) - c->addSubmachineState(dynamic_cast<QUmlState *>(element->clone())); return c; } diff --git a/src/uml/qumlstatemachine.h b/src/uml/qumlstatemachine.h index cb09386f..cc514ee7 100644 --- a/src/uml/qumlstatemachine.h +++ b/src/uml/qumlstatemachine.h @@ -59,6 +59,7 @@ class Q_UML_EXPORT QUmlStateMachine : public QUmlBehavior { public: explicit QUmlStateMachine(bool createQModelingObject = true); + virtual ~QUmlStateMachine(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstereotype.cpp b/src/uml/qumlstereotype.cpp index 81c13769..43141a82 100644 --- a/src/uml/qumlstereotype.cpp +++ b/src/uml/qumlstereotype.cpp @@ -101,6 +101,14 @@ QUmlStereotype::QUmlStereotype(bool createQModelingObject) : } /*! + Destroys the QUmlStereotype. + */ +QUmlStereotype::~QUmlStereotype() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStereotype. */ QModelingElement *QUmlStereotype::clone() const @@ -108,8 +116,6 @@ QModelingElement *QUmlStereotype::clone() const QUmlStereotype *c = new QUmlStereotype; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -119,11 +125,7 @@ QModelingElement *QUmlStereotype::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -136,22 +138,10 @@ QModelingElement *QUmlStereotype::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) c->addOwnedConnector(dynamic_cast<QUmlConnector *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) diff --git a/src/uml/qumlstereotype.h b/src/uml/qumlstereotype.h index 08657e92..06cfcff7 100644 --- a/src/uml/qumlstereotype.h +++ b/src/uml/qumlstereotype.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlStereotype : public QUmlClass { public: explicit QUmlStereotype(bool createQModelingObject = true); + virtual ~QUmlStereotype(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp index 5c04a1ae..0bbbc07f 100644 --- a/src/uml/qumlstringexpression.cpp +++ b/src/uml/qumlstringexpression.cpp @@ -77,6 +77,14 @@ QUmlStringExpression::QUmlStringExpression(bool createQModelingObject) : } /*! + Destroys the QUmlStringExpression. + */ +QUmlStringExpression::~QUmlStringExpression() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStringExpression. */ QModelingElement *QUmlStringExpression::clone() const @@ -84,17 +92,9 @@ QModelingElement *QUmlStringExpression::clone() const QUmlStringExpression *c = new QUmlStringExpression; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); foreach (QUmlValueSpecification *element, operands()) c->addOperand(dynamic_cast<QUmlValueSpecification *>(element->clone())); @@ -103,8 +103,6 @@ QModelingElement *QUmlStringExpression::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); - if (owningExpression()) - c->setOwningExpression(dynamic_cast<QUmlStringExpression *>(owningExpression()->clone())); foreach (QUmlStringExpression *element, subExpressions()) c->addSubExpression(dynamic_cast<QUmlStringExpression *>(element->clone())); return c; diff --git a/src/uml/qumlstringexpression.h b/src/uml/qumlstringexpression.h index 1c2a9514..50ed1e0f 100644 --- a/src/uml/qumlstringexpression.h +++ b/src/uml/qumlstringexpression.h @@ -54,6 +54,7 @@ class Q_UML_EXPORT QUmlStringExpression : public QUmlExpression, public QUmlTemp { public: explicit QUmlStringExpression(bool createQModelingObject = true); + virtual ~QUmlStringExpression(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstructuralfeature.cpp b/src/uml/qumlstructuralfeature.cpp index 684f87f9..579798fa 100644 --- a/src/uml/qumlstructuralfeature.cpp +++ b/src/uml/qumlstructuralfeature.cpp @@ -73,6 +73,14 @@ QUmlStructuralFeature::QUmlStructuralFeature() : } /*! + Destroys the QUmlStructuralFeature. + */ +QUmlStructuralFeature::~QUmlStructuralFeature() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStructuralFeature. */ QModelingElement *QUmlStructuralFeature::clone() const @@ -80,14 +88,10 @@ QModelingElement *QUmlStructuralFeature::clone() const QUmlStructuralFeature *c = new QUmlStructuralFeature; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); c->setOrdered(isOrdered()); c->setUnique(isUnique()); if (lowerValue()) diff --git a/src/uml/qumlstructuralfeature.h b/src/uml/qumlstructuralfeature.h index e879c887..bfddc22d 100644 --- a/src/uml/qumlstructuralfeature.h +++ b/src/uml/qumlstructuralfeature.h @@ -54,6 +54,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlStructuralFeature : public virtual QUmlTypedElement, public QUmlMultiplicityElement, public QUmlFeature { public: + virtual ~QUmlStructuralFeature(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlstructuralfeatureaction.cpp b/src/uml/qumlstructuralfeatureaction.cpp index 9be62657..0cda0cc1 100644 --- a/src/uml/qumlstructuralfeatureaction.cpp +++ b/src/uml/qumlstructuralfeatureaction.cpp @@ -84,6 +84,14 @@ QUmlStructuralFeatureAction::QUmlStructuralFeatureAction() : } /*! + Destroys the QUmlStructuralFeatureAction. + */ +QUmlStructuralFeatureAction::~QUmlStructuralFeatureAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStructuralFeatureAction. */ QModelingElement *QUmlStructuralFeatureAction::clone() const @@ -91,27 +99,11 @@ QModelingElement *QUmlStructuralFeatureAction::clone() const QUmlStructuralFeatureAction *c = new QUmlStructuralFeatureAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,8 +113,6 @@ QModelingElement *QUmlStructuralFeatureAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - if (structuralFeature()) - c->setStructuralFeature(dynamic_cast<QUmlStructuralFeature *>(structuralFeature()->clone())); return c; } diff --git a/src/uml/qumlstructuralfeatureaction.h b/src/uml/qumlstructuralfeatureaction.h index e5400765..29c42295 100644 --- a/src/uml/qumlstructuralfeatureaction.h +++ b/src/uml/qumlstructuralfeatureaction.h @@ -55,6 +55,8 @@ class QUmlStructuralFeature; class Q_UML_EXPORT QUmlStructuralFeatureAction : public QUmlAction { public: + virtual ~QUmlStructuralFeatureAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlstructuredactivitynode.cpp b/src/uml/qumlstructuredactivitynode.cpp index c7c08e45..9f3bc8ae 100644 --- a/src/uml/qumlstructuredactivitynode.cpp +++ b/src/uml/qumlstructuredactivitynode.cpp @@ -86,6 +86,14 @@ QUmlStructuredActivityNode::QUmlStructuredActivityNode(bool createQModelingObjec } /*! + Destroys the QUmlStructuredActivityNode. + */ +QUmlStructuredActivityNode::~QUmlStructuredActivityNode() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStructuredActivityNode. */ QModelingElement *QUmlStructuredActivityNode::clone() const @@ -93,25 +101,11 @@ QModelingElement *QUmlStructuredActivityNode::clone() const QUmlStructuredActivityNode *c = new QUmlStructuredActivityNode; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -125,8 +119,6 @@ QModelingElement *QUmlStructuredActivityNode::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); foreach (QUmlActivityEdge *element, edges()) c->addEdge(dynamic_cast<QUmlActivityEdge *>(element->clone())); c->setMustIsolate(mustIsolate()); diff --git a/src/uml/qumlstructuredactivitynode.h b/src/uml/qumlstructuredactivitynode.h index ff61f610..b638f74d 100644 --- a/src/uml/qumlstructuredactivitynode.h +++ b/src/uml/qumlstructuredactivitynode.h @@ -62,6 +62,7 @@ class Q_UML_EXPORT QUmlStructuredActivityNode : public QUmlAction, public QUmlNa { public: explicit QUmlStructuredActivityNode(bool createQModelingObject = true); + virtual ~QUmlStructuredActivityNode(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlstructuredclassifier.cpp b/src/uml/qumlstructuredclassifier.cpp index 901bb3e1..8e2ae985 100644 --- a/src/uml/qumlstructuredclassifier.cpp +++ b/src/uml/qumlstructuredclassifier.cpp @@ -89,6 +89,14 @@ QUmlStructuredClassifier::QUmlStructuredClassifier() } /*! + Destroys the QUmlStructuredClassifier. + */ +QUmlStructuredClassifier::~QUmlStructuredClassifier() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlStructuredClassifier. */ QModelingElement *QUmlStructuredClassifier::clone() const @@ -96,8 +104,6 @@ QModelingElement *QUmlStructuredClassifier::clone() const QUmlStructuredClassifier *c = new QUmlStructuredClassifier; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -107,11 +113,7 @@ QModelingElement *QUmlStructuredClassifier::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -125,18 +127,8 @@ QModelingElement *QUmlStructuredClassifier::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); foreach (QUmlProperty *element, ownedAttributes()) c->addOwnedAttribute(dynamic_cast<QUmlProperty *>(element->clone())); foreach (QUmlConnector *element, ownedConnectors()) diff --git a/src/uml/qumlstructuredclassifier.h b/src/uml/qumlstructuredclassifier.h index 538cb368..91f7be28 100644 --- a/src/uml/qumlstructuredclassifier.h +++ b/src/uml/qumlstructuredclassifier.h @@ -56,6 +56,8 @@ class QUmlProperty; class Q_UML_EXPORT QUmlStructuredClassifier : public virtual QUmlClassifier { public: + virtual ~QUmlStructuredClassifier(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlsubstitution.cpp b/src/uml/qumlsubstitution.cpp index 644ffcac..1a904cca 100644 --- a/src/uml/qumlsubstitution.cpp +++ b/src/uml/qumlsubstitution.cpp @@ -77,6 +77,14 @@ QUmlSubstitution::QUmlSubstitution(bool createQModelingObject) : } /*! + Destroys the QUmlSubstitution. + */ +QUmlSubstitution::~QUmlSubstitution() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlSubstitution. */ QModelingElement *QUmlSubstitution::clone() const @@ -84,26 +92,12 @@ QModelingElement *QUmlSubstitution::clone() const QUmlSubstitution *c = new QUmlSubstitution; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); if (mapping()) c->setMapping(dynamic_cast<QUmlOpaqueExpression *>(mapping()->clone())); - if (contract()) - c->setContract(dynamic_cast<QUmlClassifier *>(contract()->clone())); - if (substitutingClassifier()) - c->setSubstitutingClassifier(dynamic_cast<QUmlClassifier *>(substitutingClassifier()->clone())); return c; } diff --git a/src/uml/qumlsubstitution.h b/src/uml/qumlsubstitution.h index fc369ce0..fdffb988 100644 --- a/src/uml/qumlsubstitution.h +++ b/src/uml/qumlsubstitution.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlSubstitution : public QUmlRealization { public: explicit QUmlSubstitution(bool createQModelingObject = true); + virtual ~QUmlSubstitution(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltemplateableelement.cpp b/src/uml/qumltemplateableelement.cpp index 3dd204da..bc6369db 100644 --- a/src/uml/qumltemplateableelement.cpp +++ b/src/uml/qumltemplateableelement.cpp @@ -66,6 +66,14 @@ QUmlTemplateableElement::QUmlTemplateableElement() : } /*! + Destroys the QUmlTemplateableElement. + */ +QUmlTemplateableElement::~QUmlTemplateableElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTemplateableElement. */ QModelingElement *QUmlTemplateableElement::clone() const diff --git a/src/uml/qumltemplateableelement.h b/src/uml/qumltemplateableelement.h index 8e755245..5a8c3f3f 100644 --- a/src/uml/qumltemplateableelement.h +++ b/src/uml/qumltemplateableelement.h @@ -56,6 +56,8 @@ class QUmlTemplateSignature; class Q_UML_EXPORT QUmlTemplateableElement : public virtual QUmlElement { public: + virtual ~QUmlTemplateableElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumltemplatebinding.cpp b/src/uml/qumltemplatebinding.cpp index 0c82b305..9bd24a35 100644 --- a/src/uml/qumltemplatebinding.cpp +++ b/src/uml/qumltemplatebinding.cpp @@ -70,6 +70,14 @@ QUmlTemplateBinding::QUmlTemplateBinding(bool createQModelingObject) : } /*! + Destroys the QUmlTemplateBinding. + */ +QUmlTemplateBinding::~QUmlTemplateBinding() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTemplateBinding. */ QModelingElement *QUmlTemplateBinding::clone() const @@ -77,12 +85,8 @@ QModelingElement *QUmlTemplateBinding::clone() const QUmlTemplateBinding *c = new QUmlTemplateBinding; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (boundElement()) - c->setBoundElement(dynamic_cast<QUmlTemplateableElement *>(boundElement()->clone())); foreach (QUmlTemplateParameterSubstitution *element, parameterSubstitutions()) c->addParameterSubstitution(dynamic_cast<QUmlTemplateParameterSubstitution *>(element->clone())); - if (signature()) - c->setSignature(dynamic_cast<QUmlTemplateSignature *>(signature()->clone())); return c; } diff --git a/src/uml/qumltemplatebinding.h b/src/uml/qumltemplatebinding.h index 8e10c423..eefb14a3 100644 --- a/src/uml/qumltemplatebinding.h +++ b/src/uml/qumltemplatebinding.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlTemplateBinding : public QUmlDirectedRelationship { public: explicit QUmlTemplateBinding(bool createQModelingObject = true); + virtual ~QUmlTemplateBinding(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltemplateparameter.cpp b/src/uml/qumltemplateparameter.cpp index 3200efb9..c6904c92 100644 --- a/src/uml/qumltemplateparameter.cpp +++ b/src/uml/qumltemplateparameter.cpp @@ -71,6 +71,14 @@ QUmlTemplateParameter::QUmlTemplateParameter(bool createQModelingObject) : } /*! + Destroys the QUmlTemplateParameter. + */ +QUmlTemplateParameter::~QUmlTemplateParameter() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTemplateParameter. */ QModelingElement *QUmlTemplateParameter::clone() const @@ -78,16 +86,10 @@ QModelingElement *QUmlTemplateParameter::clone() const QUmlTemplateParameter *c = new QUmlTemplateParameter; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (default_()) - c->setDefault(dynamic_cast<QUmlParameterableElement *>(default_()->clone())); if (ownedDefault()) c->setOwnedDefault(dynamic_cast<QUmlParameterableElement *>(ownedDefault()->clone())); if (ownedParameteredElement()) c->setOwnedParameteredElement(dynamic_cast<QUmlParameterableElement *>(ownedParameteredElement()->clone())); - if (parameteredElement()) - c->setParameteredElement(dynamic_cast<QUmlParameterableElement *>(parameteredElement()->clone())); - if (signature()) - c->setSignature(dynamic_cast<QUmlTemplateSignature *>(signature()->clone())); return c; } diff --git a/src/uml/qumltemplateparameter.h b/src/uml/qumltemplateparameter.h index adc21de5..ba29cb99 100644 --- a/src/uml/qumltemplateparameter.h +++ b/src/uml/qumltemplateparameter.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlTemplateParameter : public QUmlElement { public: explicit QUmlTemplateParameter(bool createQModelingObject = true); + virtual ~QUmlTemplateParameter(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltemplateparametersubstitution.cpp b/src/uml/qumltemplateparametersubstitution.cpp index 131f91fb..5ba31ce2 100644 --- a/src/uml/qumltemplateparametersubstitution.cpp +++ b/src/uml/qumltemplateparametersubstitution.cpp @@ -71,6 +71,14 @@ QUmlTemplateParameterSubstitution::QUmlTemplateParameterSubstitution(bool create } /*! + Destroys the QUmlTemplateParameterSubstitution. + */ +QUmlTemplateParameterSubstitution::~QUmlTemplateParameterSubstitution() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTemplateParameterSubstitution. */ QModelingElement *QUmlTemplateParameterSubstitution::clone() const @@ -78,14 +86,8 @@ QModelingElement *QUmlTemplateParameterSubstitution::clone() const QUmlTemplateParameterSubstitution *c = new QUmlTemplateParameterSubstitution; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (actual()) - c->setActual(dynamic_cast<QUmlParameterableElement *>(actual()->clone())); - if (formal()) - c->setFormal(dynamic_cast<QUmlTemplateParameter *>(formal()->clone())); if (ownedActual()) c->setOwnedActual(dynamic_cast<QUmlParameterableElement *>(ownedActual()->clone())); - if (templateBinding()) - c->setTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(templateBinding()->clone())); return c; } diff --git a/src/uml/qumltemplateparametersubstitution.h b/src/uml/qumltemplateparametersubstitution.h index 5f04f7f7..5f8da441 100644 --- a/src/uml/qumltemplateparametersubstitution.h +++ b/src/uml/qumltemplateparametersubstitution.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlTemplateParameterSubstitution : public QUmlElement { public: explicit QUmlTemplateParameterSubstitution(bool createQModelingObject = true); + virtual ~QUmlTemplateParameterSubstitution(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltemplatesignature.cpp b/src/uml/qumltemplatesignature.cpp index cff29728..c14e3faa 100644 --- a/src/uml/qumltemplatesignature.cpp +++ b/src/uml/qumltemplatesignature.cpp @@ -67,6 +67,14 @@ QUmlTemplateSignature::QUmlTemplateSignature(bool createQModelingObject) : } /*! + Destroys the QUmlTemplateSignature. + */ +QUmlTemplateSignature::~QUmlTemplateSignature() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTemplateSignature. */ QModelingElement *QUmlTemplateSignature::clone() const @@ -76,10 +84,6 @@ QModelingElement *QUmlTemplateSignature::clone() const c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); foreach (QUmlTemplateParameter *element, ownedParameters()) c->addOwnedParameter(dynamic_cast<QUmlTemplateParameter *>(element->clone())); - foreach (QUmlTemplateParameter *element, parameters()) - c->addParameter(dynamic_cast<QUmlTemplateParameter *>(element->clone())); - if (template_()) - c->setTemplate(dynamic_cast<QUmlTemplateableElement *>(template_()->clone())); return c; } diff --git a/src/uml/qumltemplatesignature.h b/src/uml/qumltemplatesignature.h index 935d4ade..fdb3e0c7 100644 --- a/src/uml/qumltemplatesignature.h +++ b/src/uml/qumltemplatesignature.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlTemplateSignature : public virtual QUmlElement { public: explicit QUmlTemplateSignature(bool createQModelingObject = true); + virtual ~QUmlTemplateSignature(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltestidentityaction.cpp b/src/uml/qumltestidentityaction.cpp index 72def356..ce1c54e3 100644 --- a/src/uml/qumltestidentityaction.cpp +++ b/src/uml/qumltestidentityaction.cpp @@ -86,6 +86,14 @@ QUmlTestIdentityAction::QUmlTestIdentityAction(bool createQModelingObject) : } /*! + Destroys the QUmlTestIdentityAction. + */ +QUmlTestIdentityAction::~QUmlTestIdentityAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTestIdentityAction. */ QModelingElement *QUmlTestIdentityAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlTestIdentityAction::clone() const QUmlTestIdentityAction *c = new QUmlTestIdentityAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumltestidentityaction.h b/src/uml/qumltestidentityaction.h index f638bbd4..9fea8358 100644 --- a/src/uml/qumltestidentityaction.h +++ b/src/uml/qumltestidentityaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlTestIdentityAction : public QUmlAction { public: explicit QUmlTestIdentityAction(bool createQModelingObject = true); + virtual ~QUmlTestIdentityAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltimeconstraint.cpp b/src/uml/qumltimeconstraint.cpp index b4217046..23b7e723 100644 --- a/src/uml/qumltimeconstraint.cpp +++ b/src/uml/qumltimeconstraint.cpp @@ -78,6 +78,14 @@ QUmlTimeConstraint::QUmlTimeConstraint(bool createQModelingObject) : } /*! + Destroys the QUmlTimeConstraint. + */ +QUmlTimeConstraint::~QUmlTimeConstraint() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTimeConstraint. */ QModelingElement *QUmlTimeConstraint::clone() const @@ -85,20 +93,10 @@ QModelingElement *QUmlTimeConstraint::clone() const QUmlTimeConstraint *c = new QUmlTimeConstraint; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlElement *element, constrainedElements()) - c->addConstrainedElement(dynamic_cast<QUmlElement *>(element->clone())); - if (context()) - c->setContext(dynamic_cast<QUmlNamespace *>(context()->clone())); c->setFirstEvent(firstEvent()); if (specification()) c->setSpecification(dynamic_cast<QUmlTimeInterval *>(specification()->clone())); diff --git a/src/uml/qumltimeconstraint.h b/src/uml/qumltimeconstraint.h index 3a5e22d6..9906db66 100644 --- a/src/uml/qumltimeconstraint.h +++ b/src/uml/qumltimeconstraint.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlTimeConstraint : public QUmlIntervalConstraint { public: explicit QUmlTimeConstraint(bool createQModelingObject = true); + virtual ~QUmlTimeConstraint(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltimeevent.cpp b/src/uml/qumltimeevent.cpp index 43e1f96a..b540c051 100644 --- a/src/uml/qumltimeevent.cpp +++ b/src/uml/qumltimeevent.cpp @@ -75,6 +75,14 @@ QUmlTimeEvent::QUmlTimeEvent(bool createQModelingObject) : } /*! + Destroys the QUmlTimeEvent. + */ +QUmlTimeEvent::~QUmlTimeEvent() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTimeEvent. */ QModelingElement *QUmlTimeEvent::clone() const @@ -82,12 +90,6 @@ QModelingElement *QUmlTimeEvent::clone() const QUmlTimeEvent *c = new QUmlTimeEvent; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); diff --git a/src/uml/qumltimeevent.h b/src/uml/qumltimeevent.h index 2443d73a..80ed29e9 100644 --- a/src/uml/qumltimeevent.h +++ b/src/uml/qumltimeevent.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlTimeEvent : public QUmlEvent { public: explicit QUmlTimeEvent(bool createQModelingObject = true); + virtual ~QUmlTimeEvent(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltimeexpression.cpp b/src/uml/qumltimeexpression.cpp index cc5f890e..872d16a2 100644 --- a/src/uml/qumltimeexpression.cpp +++ b/src/uml/qumltimeexpression.cpp @@ -75,6 +75,14 @@ QUmlTimeExpression::QUmlTimeExpression(bool createQModelingObject) : } /*! + Destroys the QUmlTimeExpression. + */ +QUmlTimeExpression::~QUmlTimeExpression() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTimeExpression. */ QModelingElement *QUmlTimeExpression::clone() const @@ -82,22 +90,12 @@ QModelingElement *QUmlTimeExpression::clone() const QUmlTimeExpression *c = new QUmlTimeExpression; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); if (expr()) c->setExpr(dynamic_cast<QUmlValueSpecification *>(expr()->clone())); - foreach (QUmlObservation *element, observations()) - c->addObservation(dynamic_cast<QUmlObservation *>(element->clone())); return c; } diff --git a/src/uml/qumltimeexpression.h b/src/uml/qumltimeexpression.h index 0aff4814..6f7a9e60 100644 --- a/src/uml/qumltimeexpression.h +++ b/src/uml/qumltimeexpression.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlTimeExpression : public QUmlValueSpecification { public: explicit QUmlTimeExpression(bool createQModelingObject = true); + virtual ~QUmlTimeExpression(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltimeinterval.cpp b/src/uml/qumltimeinterval.cpp index d4705668..ff5ea40c 100644 --- a/src/uml/qumltimeinterval.cpp +++ b/src/uml/qumltimeinterval.cpp @@ -78,6 +78,14 @@ QUmlTimeInterval::QUmlTimeInterval(bool createQModelingObject) : } /*! + Destroys the QUmlTimeInterval. + */ +QUmlTimeInterval::~QUmlTimeInterval() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTimeInterval. */ QModelingElement *QUmlTimeInterval::clone() const @@ -85,22 +93,10 @@ QModelingElement *QUmlTimeInterval::clone() const QUmlTimeInterval *c = new QUmlTimeInterval; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); - if (max()) - c->setMax(dynamic_cast<QUmlTimeExpression *>(max()->clone())); - if (min()) - c->setMin(dynamic_cast<QUmlTimeExpression *>(min()->clone())); return c; } diff --git a/src/uml/qumltimeinterval.h b/src/uml/qumltimeinterval.h index 5034078b..50d77657 100644 --- a/src/uml/qumltimeinterval.h +++ b/src/uml/qumltimeinterval.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlTimeInterval : public QUmlInterval { public: explicit QUmlTimeInterval(bool createQModelingObject = true); + virtual ~QUmlTimeInterval(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltimeobservation.cpp b/src/uml/qumltimeobservation.cpp index 72657c31..69b09e7e 100644 --- a/src/uml/qumltimeobservation.cpp +++ b/src/uml/qumltimeobservation.cpp @@ -74,6 +74,14 @@ QUmlTimeObservation::QUmlTimeObservation(bool createQModelingObject) : } /*! + Destroys the QUmlTimeObservation. + */ +QUmlTimeObservation::~QUmlTimeObservation() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTimeObservation. */ QModelingElement *QUmlTimeObservation::clone() const @@ -81,18 +89,10 @@ QModelingElement *QUmlTimeObservation::clone() const QUmlTimeObservation *c = new QUmlTimeObservation; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (event_()) - c->setEvent(dynamic_cast<QUmlNamedElement *>(event_()->clone())); c->setFirstEvent(firstEvent()); return c; } diff --git a/src/uml/qumltimeobservation.h b/src/uml/qumltimeobservation.h index efb99d55..1bafc623 100644 --- a/src/uml/qumltimeobservation.h +++ b/src/uml/qumltimeobservation.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlTimeObservation : public QUmlObservation { public: explicit QUmlTimeObservation(bool createQModelingObject = true); + virtual ~QUmlTimeObservation(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltransition.cpp b/src/uml/qumltransition.cpp index 63e1aabd..0d8d7fb3 100644 --- a/src/uml/qumltransition.cpp +++ b/src/uml/qumltransition.cpp @@ -86,6 +86,14 @@ QUmlTransition::QUmlTransition(bool createQModelingObject) : } /*! + Destroys the QUmlTransition. + */ +QUmlTransition::~QUmlTransition() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTransition. */ QModelingElement *QUmlTransition::clone() const @@ -93,8 +101,6 @@ QModelingElement *QUmlTransition::clone() const QUmlTransition *c = new QUmlTransition; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -106,19 +112,11 @@ QModelingElement *QUmlTransition::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (container()) - c->setContainer(dynamic_cast<QUmlRegion *>(container()->clone())); if (effect()) c->setEffect(dynamic_cast<QUmlBehavior *>(effect()->clone())); if (guard()) c->setGuard(dynamic_cast<QUmlConstraint *>(guard()->clone())); c->setKind(kind()); - if (redefinedTransition()) - c->setRedefinedTransition(dynamic_cast<QUmlTransition *>(redefinedTransition()->clone())); - if (source()) - c->setSource(dynamic_cast<QUmlVertex *>(source()->clone())); - if (target()) - c->setTarget(dynamic_cast<QUmlVertex *>(target()->clone())); foreach (QUmlTrigger *element, triggers()) c->addTrigger(dynamic_cast<QUmlTrigger *>(element->clone())); return c; diff --git a/src/uml/qumltransition.h b/src/uml/qumltransition.h index 1944b84e..97fa4d32 100644 --- a/src/uml/qumltransition.h +++ b/src/uml/qumltransition.h @@ -64,6 +64,7 @@ class Q_UML_EXPORT QUmlTransition : public QUmlRedefinableElement, public QUmlNa { public: explicit QUmlTransition(bool createQModelingObject = true); + virtual ~QUmlTransition(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltrigger.cpp b/src/uml/qumltrigger.cpp index df0584e1..f601fe17 100644 --- a/src/uml/qumltrigger.cpp +++ b/src/uml/qumltrigger.cpp @@ -72,6 +72,14 @@ QUmlTrigger::QUmlTrigger(bool createQModelingObject) : } /*! + Destroys the QUmlTrigger. + */ +QUmlTrigger::~QUmlTrigger() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTrigger. */ QModelingElement *QUmlTrigger::clone() const @@ -79,16 +87,10 @@ QModelingElement *QUmlTrigger::clone() const QUmlTrigger *c = new QUmlTrigger; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (event_()) - c->setEvent(dynamic_cast<QUmlEvent *>(event_()->clone())); - foreach (QUmlPort *element, ports()) - c->addPort(dynamic_cast<QUmlPort *>(element->clone())); return c; } diff --git a/src/uml/qumltrigger.h b/src/uml/qumltrigger.h index 8b6be34e..da071174 100644 --- a/src/uml/qumltrigger.h +++ b/src/uml/qumltrigger.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlTrigger : public QUmlNamedElement { public: explicit QUmlTrigger(bool createQModelingObject = true); + virtual ~QUmlTrigger(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumltype.cpp b/src/uml/qumltype.cpp index fa943979..3cdde1b7 100644 --- a/src/uml/qumltype.cpp +++ b/src/uml/qumltype.cpp @@ -71,6 +71,14 @@ QUmlType::QUmlType() : } /*! + Destroys the QUmlType. + */ +QUmlType::~QUmlType() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlType. */ QModelingElement *QUmlType::clone() const @@ -78,18 +86,10 @@ QModelingElement *QUmlType::clone() const QUmlType *c = new QUmlType; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); return c; } diff --git a/src/uml/qumltype.h b/src/uml/qumltype.h index 8fa9eba0..7f32b697 100644 --- a/src/uml/qumltype.h +++ b/src/uml/qumltype.h @@ -54,6 +54,8 @@ class QUmlPackage; class Q_UML_EXPORT QUmlType : public QUmlPackageableElement { public: + virtual ~QUmlType(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumltypedelement.cpp b/src/uml/qumltypedelement.cpp index 9e950d94..784ca2ab 100644 --- a/src/uml/qumltypedelement.cpp +++ b/src/uml/qumltypedelement.cpp @@ -69,6 +69,14 @@ QUmlTypedElement::QUmlTypedElement() : } /*! + Destroys the QUmlTypedElement. + */ +QUmlTypedElement::~QUmlTypedElement() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlTypedElement. */ QModelingElement *QUmlTypedElement::clone() const @@ -76,14 +84,10 @@ QModelingElement *QUmlTypedElement::clone() const QUmlTypedElement *c = new QUmlTypedElement; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); return c; } diff --git a/src/uml/qumltypedelement.h b/src/uml/qumltypedelement.h index 8e74c776..64620e9c 100644 --- a/src/uml/qumltypedelement.h +++ b/src/uml/qumltypedelement.h @@ -54,6 +54,8 @@ class QUmlType; class Q_UML_EXPORT QUmlTypedElement : public virtual QUmlNamedElement { public: + virtual ~QUmlTypedElement(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlunmarshallaction.cpp b/src/uml/qumlunmarshallaction.cpp index 3ad2bf05..42ece27c 100644 --- a/src/uml/qumlunmarshallaction.cpp +++ b/src/uml/qumlunmarshallaction.cpp @@ -85,6 +85,14 @@ QUmlUnmarshallAction::QUmlUnmarshallAction(bool createQModelingObject) : } /*! + Destroys the QUmlUnmarshallAction. + */ +QUmlUnmarshallAction::~QUmlUnmarshallAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlUnmarshallAction. */ QModelingElement *QUmlUnmarshallAction::clone() const @@ -92,27 +100,11 @@ QModelingElement *QUmlUnmarshallAction::clone() const QUmlUnmarshallAction *c = new QUmlUnmarshallAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -124,8 +116,6 @@ QModelingElement *QUmlUnmarshallAction::clone() const c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); foreach (QUmlOutputPin *element, results()) c->addResult(dynamic_cast<QUmlOutputPin *>(element->clone())); - if (unmarshallType()) - c->setUnmarshallType(dynamic_cast<QUmlClassifier *>(unmarshallType()->clone())); return c; } diff --git a/src/uml/qumlunmarshallaction.h b/src/uml/qumlunmarshallaction.h index ff0f4bd7..65dc5986 100644 --- a/src/uml/qumlunmarshallaction.h +++ b/src/uml/qumlunmarshallaction.h @@ -57,6 +57,7 @@ class Q_UML_EXPORT QUmlUnmarshallAction : public QUmlAction { public: explicit QUmlUnmarshallAction(bool createQModelingObject = true); + virtual ~QUmlUnmarshallAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlusage.cpp b/src/uml/qumlusage.cpp index d29488c6..5883bbbb 100644 --- a/src/uml/qumlusage.cpp +++ b/src/uml/qumlusage.cpp @@ -72,6 +72,14 @@ QUmlUsage::QUmlUsage(bool createQModelingObject) : } /*! + Destroys the QUmlUsage. + */ +QUmlUsage::~QUmlUsage() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlUsage. */ QModelingElement *QUmlUsage::clone() const @@ -79,20 +87,10 @@ QModelingElement *QUmlUsage::clone() const QUmlUsage *c = new QUmlUsage; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - foreach (QUmlNamedElement *element, clients()) - c->addClient(dynamic_cast<QUmlNamedElement *>(element->clone())); - foreach (QUmlNamedElement *element, suppliers()) - c->addSupplier(dynamic_cast<QUmlNamedElement *>(element->clone())); return c; } diff --git a/src/uml/qumlusage.h b/src/uml/qumlusage.h index 463614f9..3814f338 100644 --- a/src/uml/qumlusage.h +++ b/src/uml/qumlusage.h @@ -53,6 +53,7 @@ class Q_UML_EXPORT QUmlUsage : public QUmlDependency { public: explicit QUmlUsage(bool createQModelingObject = true); + virtual ~QUmlUsage(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlusecase.cpp b/src/uml/qumlusecase.cpp index 9d87aae5..a174972e 100644 --- a/src/uml/qumlusecase.cpp +++ b/src/uml/qumlusecase.cpp @@ -94,6 +94,14 @@ QUmlUseCase::QUmlUseCase(bool createQModelingObject) } /*! + Destroys the QUmlUseCase. + */ +QUmlUseCase::~QUmlUseCase() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlUseCase. */ QModelingElement *QUmlUseCase::clone() const @@ -101,8 +109,6 @@ QModelingElement *QUmlUseCase::clone() const QUmlUseCase *c = new QUmlUseCase; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); @@ -112,11 +118,7 @@ QModelingElement *QUmlUseCase::clone() const c->addOwnedRule(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlPackageImport *element, packageImports()) c->addPackageImport(dynamic_cast<QUmlPackageImport *>(element->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); c->setVisibility(visibility()); - if (package()) - c->setPackage(dynamic_cast<QUmlPackage *>(package()->clone())); c->setLeaf(isLeaf()); foreach (QUmlTemplateBinding *element, templateBindings()) c->addTemplateBinding(dynamic_cast<QUmlTemplateBinding *>(element->clone())); @@ -130,20 +132,8 @@ QModelingElement *QUmlUseCase::clone() const c->setOwnedTemplateSignature(dynamic_cast<QUmlRedefinableTemplateSignature *>(ownedTemplateSignature()->clone())); foreach (QUmlUseCase *element, ownedUseCases()) c->addOwnedUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - foreach (QUmlGeneralizationSet *element, powertypeExtents()) - c->addPowertypeExtent(dynamic_cast<QUmlGeneralizationSet *>(element->clone())); - foreach (QUmlClassifier *element, redefinedClassifiers()) - c->addRedefinedClassifier(dynamic_cast<QUmlClassifier *>(element->clone())); - if (representation()) - c->setRepresentation(dynamic_cast<QUmlCollaborationUse *>(representation()->clone())); foreach (QUmlSubstitution *element, substitutions()) c->addSubstitution(dynamic_cast<QUmlSubstitution *>(element->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlClassifierTemplateParameter *>(templateParameter()->clone())); - foreach (QUmlUseCase *element, useCases()) - c->addUseCase(dynamic_cast<QUmlUseCase *>(element->clone())); - if (classifierBehavior()) - c->setClassifierBehavior(dynamic_cast<QUmlBehavior *>(classifierBehavior()->clone())); foreach (QUmlInterfaceRealization *element, interfaceRealizations()) c->addInterfaceRealization(dynamic_cast<QUmlInterfaceRealization *>(element->clone())); foreach (QUmlBehavior *element, ownedBehaviors()) @@ -154,8 +144,6 @@ QModelingElement *QUmlUseCase::clone() const c->addExtensionPoint(dynamic_cast<QUmlExtensionPoint *>(element->clone())); foreach (QUmlInclude *element, includes()) c->addInclude(dynamic_cast<QUmlInclude *>(element->clone())); - foreach (QUmlClassifier *element, subjects()) - c->addSubject(dynamic_cast<QUmlClassifier *>(element->clone())); return c; } diff --git a/src/uml/qumlusecase.h b/src/uml/qumlusecase.h index 9b81d326..720e7e6e 100644 --- a/src/uml/qumlusecase.h +++ b/src/uml/qumlusecase.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlUseCase : public QUmlBehavioredClassifier { public: explicit QUmlUseCase(bool createQModelingObject = true); + virtual ~QUmlUseCase(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlvaluepin.cpp b/src/uml/qumlvaluepin.cpp index 6b822f31..ac4d8110 100644 --- a/src/uml/qumlvaluepin.cpp +++ b/src/uml/qumlvaluepin.cpp @@ -86,6 +86,14 @@ QUmlValuePin::QUmlValuePin(bool createQModelingObject) : } /*! + Destroys the QUmlValuePin. + */ +QUmlValuePin::~QUmlValuePin() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlValuePin. */ QModelingElement *QUmlValuePin::clone() const @@ -99,35 +107,13 @@ QModelingElement *QUmlValuePin::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - foreach (QUmlState *element, inStates()) - c->addInState(dynamic_cast<QUmlState *>(element->clone())); c->setControlType(isControlType()); c->setOrdering(ordering()); - if (selection()) - c->setSelection(dynamic_cast<QUmlBehavior *>(selection()->clone())); if (upperBound()) c->setUpperBound(dynamic_cast<QUmlValueSpecification *>(upperBound()->clone())); c->setControl(isControl()); diff --git a/src/uml/qumlvaluepin.h b/src/uml/qumlvaluepin.h index 7ae83eef..8706aa56 100644 --- a/src/uml/qumlvaluepin.h +++ b/src/uml/qumlvaluepin.h @@ -55,6 +55,7 @@ class Q_UML_EXPORT QUmlValuePin : public QUmlInputPin { public: explicit QUmlValuePin(bool createQModelingObject = true); + virtual ~QUmlValuePin(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlvaluespecification.cpp b/src/uml/qumlvaluespecification.cpp index 18bdd1a1..ded01bef 100644 --- a/src/uml/qumlvaluespecification.cpp +++ b/src/uml/qumlvaluespecification.cpp @@ -71,6 +71,14 @@ QUmlValueSpecification::QUmlValueSpecification() } /*! + Destroys the QUmlValueSpecification. + */ +QUmlValueSpecification::~QUmlValueSpecification() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlValueSpecification. */ QModelingElement *QUmlValueSpecification::clone() const @@ -78,17 +86,9 @@ QModelingElement *QUmlValueSpecification::clone() const QUmlValueSpecification *c = new QUmlValueSpecification; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(templateParameter()->clone())); c->setVisibility(visibility()); return c; } diff --git a/src/uml/qumlvaluespecification.h b/src/uml/qumlvaluespecification.h index be13c5a1..b89bb2d6 100644 --- a/src/uml/qumlvaluespecification.h +++ b/src/uml/qumlvaluespecification.h @@ -55,6 +55,8 @@ class QUmlParameterableElement; class Q_UML_EXPORT QUmlValueSpecification : public QUmlTypedElement, public QUmlPackageableElement { public: + virtual ~QUmlValueSpecification(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlvaluespecificationaction.cpp b/src/uml/qumlvaluespecificationaction.cpp index e07ae176..b567bfaa 100644 --- a/src/uml/qumlvaluespecificationaction.cpp +++ b/src/uml/qumlvaluespecificationaction.cpp @@ -86,6 +86,14 @@ QUmlValueSpecificationAction::QUmlValueSpecificationAction(bool createQModelingO } /*! + Destroys the QUmlValueSpecificationAction. + */ +QUmlValueSpecificationAction::~QUmlValueSpecificationAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlValueSpecificationAction. */ QModelingElement *QUmlValueSpecificationAction::clone() const @@ -93,27 +101,11 @@ QModelingElement *QUmlValueSpecificationAction::clone() const QUmlValueSpecificationAction *c = new QUmlValueSpecificationAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlvaluespecificationaction.h b/src/uml/qumlvaluespecificationaction.h index 113bd14f..829c1037 100644 --- a/src/uml/qumlvaluespecificationaction.h +++ b/src/uml/qumlvaluespecificationaction.h @@ -56,6 +56,7 @@ class Q_UML_EXPORT QUmlValueSpecificationAction : public QUmlAction { public: explicit QUmlValueSpecificationAction(bool createQModelingObject = true); + virtual ~QUmlValueSpecificationAction(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlvariable.cpp b/src/uml/qumlvariable.cpp index 55fb660f..e1c47878 100644 --- a/src/uml/qumlvariable.cpp +++ b/src/uml/qumlvariable.cpp @@ -81,6 +81,14 @@ QUmlVariable::QUmlVariable(bool createQModelingObject) : } /*! + Destroys the QUmlVariable. + */ +QUmlVariable::~QUmlVariable() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlVariable. */ QModelingElement *QUmlVariable::clone() const @@ -94,22 +102,10 @@ QModelingElement *QUmlVariable::clone() const c->setLowerValue(dynamic_cast<QUmlValueSpecification *>(lowerValue()->clone())); if (upperValue()) c->setUpperValue(dynamic_cast<QUmlValueSpecification *>(upperValue()->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (type()) - c->setType(dynamic_cast<QUmlType *>(type()->clone())); - if (owningTemplateParameter()) - c->setOwningTemplateParameter(dynamic_cast<QUmlTemplateParameter *>(owningTemplateParameter()->clone())); - if (templateParameter()) - c->setTemplateParameter(dynamic_cast<QUmlConnectableElementTemplateParameter *>(templateParameter()->clone())); - if (activityScope()) - c->setActivityScope(dynamic_cast<QUmlActivity *>(activityScope()->clone())); - if (scope()) - c->setScope(dynamic_cast<QUmlStructuredActivityNode *>(scope()->clone())); return c; } diff --git a/src/uml/qumlvariable.h b/src/uml/qumlvariable.h index 0813bd14..e9146c16 100644 --- a/src/uml/qumlvariable.h +++ b/src/uml/qumlvariable.h @@ -58,6 +58,7 @@ class Q_UML_EXPORT QUmlVariable : public QUmlMultiplicityElement, public QUmlCon { public: explicit QUmlVariable(bool createQModelingObject = true); + virtual ~QUmlVariable(); virtual QModelingElement *clone() const; diff --git a/src/uml/qumlvariableaction.cpp b/src/uml/qumlvariableaction.cpp index ed80b3a8..3989b49b 100644 --- a/src/uml/qumlvariableaction.cpp +++ b/src/uml/qumlvariableaction.cpp @@ -83,6 +83,14 @@ QUmlVariableAction::QUmlVariableAction() : } /*! + Destroys the QUmlVariableAction. + */ +QUmlVariableAction::~QUmlVariableAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlVariableAction. */ QModelingElement *QUmlVariableAction::clone() const @@ -90,27 +98,11 @@ QModelingElement *QUmlVariableAction::clone() const QUmlVariableAction *c = new QUmlVariableAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -118,8 +110,6 @@ QModelingElement *QUmlVariableAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (variable()) - c->setVariable(dynamic_cast<QUmlVariable *>(variable()->clone())); return c; } diff --git a/src/uml/qumlvariableaction.h b/src/uml/qumlvariableaction.h index 96826015..1c877f4f 100644 --- a/src/uml/qumlvariableaction.h +++ b/src/uml/qumlvariableaction.h @@ -54,6 +54,8 @@ class QUmlVariable; class Q_UML_EXPORT QUmlVariableAction : public QUmlAction { public: + virtual ~QUmlVariableAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlvertex.cpp b/src/uml/qumlvertex.cpp index 83ab8397..f657a910 100644 --- a/src/uml/qumlvertex.cpp +++ b/src/uml/qumlvertex.cpp @@ -71,6 +71,14 @@ QUmlVertex::QUmlVertex() : } /*! + Destroys the QUmlVertex. + */ +QUmlVertex::~QUmlVertex() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlVertex. */ QModelingElement *QUmlVertex::clone() const @@ -78,14 +86,10 @@ QModelingElement *QUmlVertex::clone() const QUmlVertex *c = new QUmlVertex; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); - if (container()) - c->setContainer(dynamic_cast<QUmlRegion *>(container()->clone())); return c; } diff --git a/src/uml/qumlvertex.h b/src/uml/qumlvertex.h index 9d0ca688..bd446ad3 100644 --- a/src/uml/qumlvertex.h +++ b/src/uml/qumlvertex.h @@ -56,6 +56,8 @@ class QUmlTransition; class Q_UML_EXPORT QUmlVertex : public virtual QUmlNamedElement { public: + virtual ~QUmlVertex(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlwritelinkaction.cpp b/src/uml/qumlwritelinkaction.cpp index 1a36aea2..dfafc5a7 100644 --- a/src/uml/qumlwritelinkaction.cpp +++ b/src/uml/qumlwritelinkaction.cpp @@ -83,6 +83,14 @@ QUmlWriteLinkAction::QUmlWriteLinkAction() } /*! + Destroys the QUmlWriteLinkAction. + */ +QUmlWriteLinkAction::~QUmlWriteLinkAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlWriteLinkAction. */ QModelingElement *QUmlWriteLinkAction::clone() const @@ -90,27 +98,11 @@ QModelingElement *QUmlWriteLinkAction::clone() const QUmlWriteLinkAction *c = new QUmlWriteLinkAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); diff --git a/src/uml/qumlwritelinkaction.h b/src/uml/qumlwritelinkaction.h index c46d75c2..d49edbd6 100644 --- a/src/uml/qumlwritelinkaction.h +++ b/src/uml/qumlwritelinkaction.h @@ -52,6 +52,8 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlWriteLinkAction : public QUmlLinkAction { public: + virtual ~QUmlWriteLinkAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlwritestructuralfeatureaction.cpp b/src/uml/qumlwritestructuralfeatureaction.cpp index f68231fa..4c765f77 100644 --- a/src/uml/qumlwritestructuralfeatureaction.cpp +++ b/src/uml/qumlwritestructuralfeatureaction.cpp @@ -84,6 +84,14 @@ QUmlWriteStructuralFeatureAction::QUmlWriteStructuralFeatureAction() : } /*! + Destroys the QUmlWriteStructuralFeatureAction. + */ +QUmlWriteStructuralFeatureAction::~QUmlWriteStructuralFeatureAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlWriteStructuralFeatureAction. */ QModelingElement *QUmlWriteStructuralFeatureAction::clone() const @@ -91,27 +99,11 @@ QModelingElement *QUmlWriteStructuralFeatureAction::clone() const QUmlWriteStructuralFeatureAction *c = new QUmlWriteStructuralFeatureAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -121,8 +113,6 @@ QModelingElement *QUmlWriteStructuralFeatureAction::clone() const c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); if (object()) c->setObject(dynamic_cast<QUmlInputPin *>(object()->clone())); - if (structuralFeature()) - c->setStructuralFeature(dynamic_cast<QUmlStructuralFeature *>(structuralFeature()->clone())); if (result()) c->setResult(dynamic_cast<QUmlOutputPin *>(result()->clone())); if (value()) diff --git a/src/uml/qumlwritestructuralfeatureaction.h b/src/uml/qumlwritestructuralfeatureaction.h index c3922f73..a3b8228a 100644 --- a/src/uml/qumlwritestructuralfeatureaction.h +++ b/src/uml/qumlwritestructuralfeatureaction.h @@ -55,6 +55,8 @@ class QUmlOutputPin; class Q_UML_EXPORT QUmlWriteStructuralFeatureAction : public QUmlStructuralFeatureAction { public: + virtual ~QUmlWriteStructuralFeatureAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlwritevariableaction.cpp b/src/uml/qumlwritevariableaction.cpp index d10d8b0a..2dddb8d2 100644 --- a/src/uml/qumlwritevariableaction.cpp +++ b/src/uml/qumlwritevariableaction.cpp @@ -83,6 +83,14 @@ QUmlWriteVariableAction::QUmlWriteVariableAction() : } /*! + Destroys the QUmlWriteVariableAction. + */ +QUmlWriteVariableAction::~QUmlWriteVariableAction() +{ + QModelingElement::deleteQModelingObject(); +} + +/*! Returns a deep-copied clone of the QUmlWriteVariableAction. */ QModelingElement *QUmlWriteVariableAction::clone() const @@ -90,27 +98,11 @@ QModelingElement *QUmlWriteVariableAction::clone() const QUmlWriteVariableAction *c = new QUmlWriteVariableAction; foreach (QUmlComment *element, ownedComments()) c->addOwnedComment(dynamic_cast<QUmlComment *>(element->clone())); - foreach (QUmlDependency *element, clientDependencies()) - c->addClientDependency(dynamic_cast<QUmlDependency *>(element->clone())); c->setName(name()); if (nameExpression()) c->setNameExpression(dynamic_cast<QUmlStringExpression *>(nameExpression()->clone())); c->setVisibility(visibility()); c->setLeaf(isLeaf()); - if (activity()) - c->setActivity(dynamic_cast<QUmlActivity *>(activity()->clone())); - foreach (QUmlInterruptibleActivityRegion *element, inInterruptibleRegions()) - c->addInInterruptibleRegion(dynamic_cast<QUmlInterruptibleActivityRegion *>(element->clone())); - foreach (QUmlActivityPartition *element, inPartitions()) - c->addInPartition(dynamic_cast<QUmlActivityPartition *>(element->clone())); - if (inStructuredNode()) - c->setInStructuredNode(dynamic_cast<QUmlStructuredActivityNode *>(inStructuredNode()->clone())); - foreach (QUmlActivityEdge *element, incomings()) - c->addIncoming(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityEdge *element, outgoings()) - c->addOutgoing(dynamic_cast<QUmlActivityEdge *>(element->clone())); - foreach (QUmlActivityNode *element, redefinedNodes()) - c->addRedefinedNode(dynamic_cast<QUmlActivityNode *>(element->clone())); foreach (QUmlExceptionHandler *element, handlers()) c->addHandler(dynamic_cast<QUmlExceptionHandler *>(element->clone())); c->setLocallyReentrant(isLocallyReentrant()); @@ -118,8 +110,6 @@ QModelingElement *QUmlWriteVariableAction::clone() const c->addLocalPostcondition(dynamic_cast<QUmlConstraint *>(element->clone())); foreach (QUmlConstraint *element, localPreconditions()) c->addLocalPrecondition(dynamic_cast<QUmlConstraint *>(element->clone())); - if (variable()) - c->setVariable(dynamic_cast<QUmlVariable *>(variable()->clone())); if (value()) c->setValue(dynamic_cast<QUmlInputPin *>(value()->clone())); return c; diff --git a/src/uml/qumlwritevariableaction.h b/src/uml/qumlwritevariableaction.h index 981b1e09..09e6fd97 100644 --- a/src/uml/qumlwritevariableaction.h +++ b/src/uml/qumlwritevariableaction.h @@ -54,6 +54,8 @@ class QUmlInputPin; class Q_UML_EXPORT QUmlWriteVariableAction : public QUmlVariableAction { public: + virtual ~QUmlWriteVariableAction(); + Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes |