diff options
Diffstat (limited to 'src/mof')
128 files changed, 585 insertions, 2330 deletions
diff --git a/src/mof/qargument.cpp b/src/mof/qargument.cpp index 778b5f09..054cd348 100644 --- a/src/mof/qargument.cpp +++ b/src/mof/qargument.cpp @@ -110,28 +110,6 @@ void QArgument::setValue(QMofObject *value) } } -void QArgument::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *>("QT_PREPEND_NAMESPACE_QTMOF(QArgument) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<QArgument *>("QArgument *"); - qRegisterMetaType<const QSet<QArgument *> *>("const QSet<QArgument *> *"); - qRegisterMetaType<const QList<QArgument *> *>("const QList<QArgument *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qargument.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qargument.h b/src/mof/qargument.h index 98f92ee3..27ac6d8d 100644 --- a/src/mof/qargument.h +++ b/src/mof/qargument.h @@ -80,7 +80,6 @@ public: Q_INVOKABLE void setName(QString name); Q_INVOKABLE QMofObject *value() const; Q_INVOKABLE void setValue(QMofObject *value); - virtual void registerMetaTypes() const; protected: explicit QArgument(QArgumentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QArgument) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *) - QT_END_HEADER #endif // QTMOF_QARGUMENT_H diff --git a/src/mof/qassociation.cpp b/src/mof/qassociation.cpp index 3ec560b2..0805bd66 100644 --- a/src/mof/qassociation.cpp +++ b/src/mof/qassociation.cpp @@ -48,18 +48,12 @@ QT_BEGIN_NAMESPACE_QTMOF QAssociationPrivate::QAssociationPrivate() : - isDerived(false), - navigableOwnedEnds(new QSet<QProperty *>), - ownedEnds(new QList<QProperty *>), - memberEnds(new QList<QProperty *>) + isDerived(false) { } QAssociationPrivate::~QAssociationPrivate() { - delete navigableOwnedEnds; - delete ownedEnds; - delete memberEnds; } /*! @@ -95,7 +89,7 @@ QAssociation::~QAssociation() /*! The Elements owned by this element. */ -const QSet<QElement *> *QAssociation::ownedElements() const +const QSet<QElement *> &QAssociation::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -111,7 +105,7 @@ QElement *QAssociation::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QAssociation::ownedComments() const +const QSet<QComment *> &QAssociation::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -133,7 +127,7 @@ void QAssociation::removeOwnedComment(QComment *ownedComment) /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QAssociation::relatedElements() const +const QSet<QElement *> &QAssociation::relatedElements() const { return (qwrappedobject_cast<const QRelationship *>(this))->relatedElements(); } @@ -243,7 +237,7 @@ void QAssociation::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const +const QSet<QRedefinableElement *> &QAssociation::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -251,7 +245,7 @@ const QSet<QRedefinableElement *> *QAssociation::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QAssociation::redefinitionContexts() const +const QSet<QClassifier *> &QAssociation::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -263,7 +257,7 @@ const QSet<QClassifier *> *QAssociation::redefinitionContexts() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QAssociation::packageImports() const +const QSet<QPackageImport *> &QAssociation::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -281,7 +275,7 @@ void QAssociation::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QAssociation::members() const +const QSet<QNamedElement *> &QAssociation::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -289,7 +283,7 @@ const QSet<QNamedElement *> *QAssociation::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QAssociation::importedMembers() const +const QSet<QPackageableElement *> &QAssociation::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -297,7 +291,7 @@ const QSet<QPackageableElement *> *QAssociation::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QAssociation::elementImports() const +const QSet<QElementImport *> &QAssociation::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -315,7 +309,7 @@ void QAssociation::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QAssociation::ownedRules() const +const QSet<QConstraint *> &QAssociation::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -333,7 +327,7 @@ void QAssociation::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QAssociation::ownedMembers() const +const QSet<QNamedElement *> &QAssociation::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -385,7 +379,7 @@ void QAssociation::unsetFinalSpecialization() /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QAssociation::attributes() const +const QSet<QProperty *> &QAssociation::attributes() const { return (qwrappedobject_cast<const QClassifier *>(this))->attributes(); } @@ -393,7 +387,7 @@ const QSet<QProperty *> *QAssociation::attributes() const /*! Specifies each feature defined in the classifier. */ -const QSet<QFeature *> *QAssociation::features() const +const QSet<QFeature *> &QAssociation::features() const { return (qwrappedobject_cast<const QClassifier *>(this))->features(); } @@ -401,7 +395,7 @@ const QSet<QFeature *> *QAssociation::features() const /*! Specifies the general Classifiers for this Classifier. */ -const QSet<QClassifier *> *QAssociation::generals() const +const QSet<QClassifier *> &QAssociation::generals() const { return (qwrappedobject_cast<const QClassifier *>(this))->generals(); } @@ -419,7 +413,7 @@ void QAssociation::removeGeneral(QClassifier *general) /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QAssociation::redefinedClassifiers() const +const QSet<QClassifier *> &QAssociation::redefinedClassifiers() const { return (qwrappedobject_cast<const QClassifier *>(this))->redefinedClassifiers(); } @@ -437,7 +431,7 @@ void QAssociation::removeRedefinedClassifier(QClassifier *redefinedClassifier) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QAssociation::inheritedMembers() const +const QSet<QNamedElement *> &QAssociation::inheritedMembers() const { return (qwrappedobject_cast<const QClassifier *>(this))->inheritedMembers(); } @@ -445,7 +439,7 @@ const QSet<QNamedElement *> *QAssociation::inheritedMembers() const /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QAssociation::generalizations() const +const QSet<QGeneralization *> &QAssociation::generalizations() const { return (qwrappedobject_cast<const QClassifier *>(this))->generalizations(); } @@ -497,19 +491,19 @@ void QAssociation::unsetDerived() /*! References the classifiers that are used as types of the ends of the association. */ -const QList<QType *> *QAssociation::endTypes() const +const QList<QType *> &QAssociation::endTypes() const { // This is a read-only derived association end qWarning("QAssociation::endTypes: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QList<QType *>); // change here to your derived return } /*! The navigable ends that are owned by the association itself. */ -const QSet<QProperty *> *QAssociation::navigableOwnedEnds() const +const QSet<QProperty *> &QAssociation::navigableOwnedEnds() const { // This is a read-write association end @@ -522,8 +516,8 @@ void QAssociation::addNavigableOwnedEnd(QProperty *navigableOwnedEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->navigableOwnedEnds->contains(navigableOwnedEnd)) { - d->navigableOwnedEnds->insert(navigableOwnedEnd); + if (!d->navigableOwnedEnds.contains(navigableOwnedEnd)) { + d->navigableOwnedEnds.insert(navigableOwnedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->addOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); @@ -535,8 +529,8 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) // This is a read-write association end Q_D(QAssociation); - if (d->navigableOwnedEnds->contains(navigableOwnedEnd)) { - d->navigableOwnedEnds->remove(navigableOwnedEnd); + if (d->navigableOwnedEnds.contains(navigableOwnedEnd)) { + d->navigableOwnedEnds.remove(navigableOwnedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QAssociation *>(this))->removeOwnedEnd(qwrappedobject_cast<QProperty *>(navigableOwnedEnd)); @@ -546,7 +540,7 @@ void QAssociation::removeNavigableOwnedEnd(QProperty *navigableOwnedEnd) /*! The ends that are owned by the association itself. */ -const QList<QProperty *> *QAssociation::ownedEnds() const +const QList<QProperty *> &QAssociation::ownedEnds() const { // This is a read-write association end @@ -559,8 +553,8 @@ void QAssociation::addOwnedEnd(QProperty *ownedEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->ownedEnds->contains(ownedEnd)) { - d->ownedEnds->append(ownedEnd); + if (!d->ownedEnds.contains(ownedEnd)) { + d->ownedEnds.append(ownedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); @@ -577,8 +571,8 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) // This is a read-write association end Q_D(QAssociation); - if (d->ownedEnds->contains(ownedEnd)) { - d->ownedEnds->removeAll(ownedEnd); + if (d->ownedEnds.contains(ownedEnd)) { + d->ownedEnds.removeAll(ownedEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedEnd)); @@ -593,7 +587,7 @@ void QAssociation::removeOwnedEnd(QProperty *ownedEnd) /*! Each end represents participation of instances of the classifier connected to the end in links of the association. */ -const QList<QProperty *> *QAssociation::memberEnds() const +const QList<QProperty *> &QAssociation::memberEnds() const { // This is a read-write association end @@ -606,8 +600,8 @@ void QAssociation::addMemberEnd(QProperty *memberEnd) // This is a read-write association end Q_D(QAssociation); - if (!d->memberEnds->contains(memberEnd)) { - d->memberEnds->append(memberEnd); + if (!d->memberEnds.contains(memberEnd)) { + d->memberEnds.append(memberEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); @@ -622,8 +616,8 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) // This is a read-write association end Q_D(QAssociation); - if (d->memberEnds->contains(memberEnd)) { - d->memberEnds->removeAll(memberEnd); + if (d->memberEnds.contains(memberEnd)) { + d->memberEnds.removeAll(memberEnd); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeMember(qwrappedobject_cast<QNamedElement *>(memberEnd)); @@ -633,35 +627,6 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) } } -void QAssociation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qassociation.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qassociation.h b/src/mof/qassociation.h index d630295a..49ec5469 100644 --- a/src/mof/qassociation.h +++ b/src/mof/qassociation.h @@ -70,10 +70,10 @@ class Q_MOF_EXPORT QAssociation : public QWrappedObject Q_OBJECT Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) - Q_PROPERTY(const QList<QType *> * endTypes READ endTypes STORED false) - Q_PROPERTY(const QSet<QProperty *> * navigableOwnedEnds READ navigableOwnedEnds) - Q_PROPERTY(const QList<QProperty *> * ownedEnds READ ownedEnds) - Q_PROPERTY(const QList<QProperty *> * memberEnds READ memberEnds) + Q_PROPERTY(QList<QType *> endTypes READ endTypes STORED false) + Q_PROPERTY(QSet<QProperty *> navigableOwnedEnds READ navigableOwnedEnds) + Q_PROPERTY(QList<QProperty *> ownedEnds READ ownedEnds) + Q_PROPERTY(QList<QProperty *> memberEnds READ memberEnds) Q_DISABLE_COPY(QAssociation) Q_DECLARE_PRIVATE(QAssociation) @@ -83,14 +83,14 @@ public: virtual ~QAssociation(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Association ends from aggregated QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; @@ -115,22 +115,22 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from aggregated QClassifier Q_INVOKABLE bool isAbstract() const; @@ -141,16 +141,16 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from aggregated QClassifier - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); @@ -160,17 +160,16 @@ public: Q_INVOKABLE void unsetDerived(); // Association ends from QAssociation - Q_INVOKABLE const QList<QType *> *endTypes() const; - Q_INVOKABLE const QSet<QProperty *> *navigableOwnedEnds() const; + Q_INVOKABLE const QList<QType *> &endTypes() const; + Q_INVOKABLE const QSet<QProperty *> &navigableOwnedEnds() const; Q_INVOKABLE void addNavigableOwnedEnd(QProperty *navigableOwnedEnd); Q_INVOKABLE void removeNavigableOwnedEnd(QProperty *navigableOwnedEnd); - Q_INVOKABLE const QList<QProperty *> *ownedEnds() const; + Q_INVOKABLE const QList<QProperty *> &ownedEnds() const; Q_INVOKABLE void addOwnedEnd(QProperty *ownedEnd); Q_INVOKABLE void removeOwnedEnd(QProperty *ownedEnd); - Q_INVOKABLE const QList<QProperty *> *memberEnds() const; + Q_INVOKABLE const QList<QProperty *> &memberEnds() const; Q_INVOKABLE void addMemberEnd(QProperty *memberEnd); Q_INVOKABLE void removeMemberEnd(QProperty *memberEnd); - virtual void registerMetaTypes() const; protected: explicit QAssociation(QAssociationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -182,10 +181,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *) - QT_END_HEADER #endif // QTMOF_QASSOCIATION_H diff --git a/src/mof/qassociation_p.h b/src/mof/qassociation_p.h index 599ac8ff..7a0e2458 100644 --- a/src/mof/qassociation_p.h +++ b/src/mof/qassociation_p.h @@ -73,9 +73,9 @@ public: virtual ~QAssociationPrivate(); bool isDerived; - QSet<QProperty *> *navigableOwnedEnds; - QList<QProperty *> *ownedEnds; - QList<QProperty *> *memberEnds; + QSet<QProperty *> navigableOwnedEnds; + QList<QProperty *> ownedEnds; + QList<QProperty *> memberEnds; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qbehavioralfeature.cpp b/src/mof/qbehavioralfeature.cpp index 2cf88f54..230c3155 100644 --- a/src/mof/qbehavioralfeature.cpp +++ b/src/mof/qbehavioralfeature.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QBehavioralFeaturePrivate::QBehavioralFeaturePrivate() : - raisedExceptions(new QSet<QType *>), - ownedParameters(new QList<QParameter *>) +QBehavioralFeaturePrivate::QBehavioralFeaturePrivate() { } QBehavioralFeaturePrivate::~QBehavioralFeaturePrivate() { - delete raisedExceptions; - delete ownedParameters; } /*! @@ -93,7 +89,7 @@ QBehavioralFeature::~QBehavioralFeature() /*! The Elements owned by this element. */ -const QSet<QElement *> *QBehavioralFeature::ownedElements() const +const QSet<QElement *> &QBehavioralFeature::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -109,7 +105,7 @@ QElement *QBehavioralFeature::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QBehavioralFeature::ownedComments() const +const QSet<QComment *> &QBehavioralFeature::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -203,7 +199,7 @@ void QBehavioralFeature::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const +const QSet<QRedefinableElement *> &QBehavioralFeature::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -211,7 +207,7 @@ const QSet<QRedefinableElement *> *QBehavioralFeature::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QBehavioralFeature::redefinitionContexts() const +const QSet<QClassifier *> &QBehavioralFeature::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -245,7 +241,7 @@ void QBehavioralFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const +const QSet<QClassifier *> &QBehavioralFeature::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -257,7 +253,7 @@ const QSet<QClassifier *> *QBehavioralFeature::featuringClassifiers() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QBehavioralFeature::packageImports() const +const QSet<QPackageImport *> &QBehavioralFeature::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -275,7 +271,7 @@ void QBehavioralFeature::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QBehavioralFeature::members() const +const QSet<QNamedElement *> &QBehavioralFeature::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -283,7 +279,7 @@ const QSet<QNamedElement *> *QBehavioralFeature::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const +const QSet<QPackageableElement *> &QBehavioralFeature::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -291,7 +287,7 @@ const QSet<QPackageableElement *> *QBehavioralFeature::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QBehavioralFeature::elementImports() const +const QSet<QElementImport *> &QBehavioralFeature::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -309,7 +305,7 @@ void QBehavioralFeature::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QBehavioralFeature::ownedRules() const +const QSet<QConstraint *> &QBehavioralFeature::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -327,7 +323,7 @@ void QBehavioralFeature::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const +const QSet<QNamedElement *> &QBehavioralFeature::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -339,7 +335,7 @@ const QSet<QNamedElement *> *QBehavioralFeature::ownedMembers() const /*! References the Types representing exceptions that may be raised during an invocation of this feature. */ -const QSet<QType *> *QBehavioralFeature::raisedExceptions() const +const QSet<QType *> &QBehavioralFeature::raisedExceptions() const { // This is a read-write association end @@ -352,8 +348,8 @@ void QBehavioralFeature::addRaisedException(QType *raisedException) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->insert(raisedException); + if (!d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.insert(raisedException); } } @@ -362,15 +358,15 @@ void QBehavioralFeature::removeRaisedException(QType *raisedException) // This is a read-write association end Q_D(QBehavioralFeature); - if (d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->remove(raisedException); + if (d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.remove(raisedException); } } /*! Specifies the ordered set of formal parameters of this BehavioralFeature. */ -const QList<QParameter *> *QBehavioralFeature::ownedParameters() const +const QList<QParameter *> &QBehavioralFeature::ownedParameters() const { // This is a read-write association end @@ -383,8 +379,8 @@ void QBehavioralFeature::addOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavioralFeature); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -396,8 +392,8 @@ void QBehavioralFeature::removeOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QBehavioralFeature); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedParameter)); @@ -416,42 +412,6 @@ bool QBehavioralFeature::isDistinguishableFrom(const QNamedElement *n, const QNa return bool(); // change here to your derived return } -void QBehavioralFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *"); - qRegisterMetaType<QBehavioralFeature *>("QBehavioralFeature *"); - qRegisterMetaType<const QSet<QBehavioralFeature *> *>("const QSet<QBehavioralFeature *> *"); - qRegisterMetaType<const QList<QBehavioralFeature *> *>("const QList<QBehavioralFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *>("QT_PREPEND_NAMESPACE_QTMOF(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qbehavioralfeature.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qbehavioralfeature.h b/src/mof/qbehavioralfeature.h index f5ce0292..dd79d78c 100644 --- a/src/mof/qbehavioralfeature.h +++ b/src/mof/qbehavioralfeature.h @@ -70,8 +70,8 @@ class Q_MOF_EXPORT QBehavioralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(const QSet<QType *> * raisedExceptions READ raisedExceptions) - Q_PROPERTY(const QList<QParameter *> * ownedParameters READ ownedParameters) + Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) + Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) Q_DISABLE_COPY(QBehavioralFeature) Q_DECLARE_PRIVATE(QBehavioralFeature) @@ -81,9 +81,9 @@ public: virtual ~QBehavioralFeature(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,8 +103,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -112,33 +112,32 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Association ends from QBehavioralFeature - Q_INVOKABLE const QSet<QType *> *raisedExceptions() const; + Q_INVOKABLE const QSet<QType *> &raisedExceptions() const; Q_INVOKABLE void addRaisedException(QType *raisedException); Q_INVOKABLE void removeRaisedException(QType *raisedException); - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); // Operations Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; - virtual void registerMetaTypes() const; protected: explicit QBehavioralFeature(QBehavioralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -150,10 +149,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QBehavioralFeature) *> *) - QT_END_HEADER #endif // QTMOF_QBEHAVIORALFEATURE_H diff --git a/src/mof/qbehavioralfeature_p.h b/src/mof/qbehavioralfeature_p.h index b8181aaa..fa1db620 100644 --- a/src/mof/qbehavioralfeature_p.h +++ b/src/mof/qbehavioralfeature_p.h @@ -72,8 +72,8 @@ public: explicit QBehavioralFeaturePrivate(); virtual ~QBehavioralFeaturePrivate(); - QSet<QType *> *raisedExceptions; - QList<QParameter *> *ownedParameters; + QSet<QType *> raisedExceptions; + QList<QParameter *> ownedParameters; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qclass.cpp b/src/mof/qclass.cpp index 77ab7959..75cfe0f1 100644 --- a/src/mof/qclass.cpp +++ b/src/mof/qclass.cpp @@ -49,18 +49,12 @@ QT_BEGIN_NAMESPACE_QTMOF QClassPrivate::QClassPrivate() : - isAbstract(false), - nestedClassifiers(new QList<QClassifier *>), - ownedOperations(new QList<QOperation *>), - ownedAttributes(new QList<QProperty *>) + isAbstract(false) { } QClassPrivate::~QClassPrivate() { - delete nestedClassifiers; - delete ownedOperations; - delete ownedAttributes; } /*! @@ -122,7 +116,7 @@ void QClass::unsetAbstract() /*! References all the Classifiers that are defined (nested) within the Class. */ -const QList<QClassifier *> *QClass::nestedClassifiers() const +const QList<QClassifier *> &QClass::nestedClassifiers() const { // This is a read-write association end @@ -135,8 +129,8 @@ void QClass::addNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QClass); - if (!d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->append(nestedClassifier); + if (!d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.append(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -148,8 +142,8 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) // This is a read-write association end Q_D(QClass); - if (d->nestedClassifiers->contains(nestedClassifier)) { - d->nestedClassifiers->removeAll(nestedClassifier); + if (d->nestedClassifiers.contains(nestedClassifier)) { + d->nestedClassifiers.removeAll(nestedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(nestedClassifier)); @@ -159,7 +153,7 @@ void QClass::removeNestedClassifier(QClassifier *nestedClassifier) /*! The operations owned by the class. */ -const QList<QOperation *> *QClass::ownedOperations() const +const QList<QOperation *> &QClass::ownedOperations() const { // This is a read-write association end @@ -172,8 +166,8 @@ void QClass::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QClass); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -189,8 +183,8 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QClass); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -204,7 +198,7 @@ void QClass::removeOwnedOperation(QOperation *ownedOperation) /*! The attributes (i.e. the properties) owned by the class. */ -const QList<QProperty *> *QClass::ownedAttributes() const +const QList<QProperty *> &QClass::ownedAttributes() const { // This is a read-write association end @@ -217,8 +211,8 @@ void QClass::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QClass); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -234,8 +228,8 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QClass); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -249,13 +243,13 @@ void QClass::removeOwnedAttribute(QProperty *ownedAttribute) /*! This gives the superclasses of a class. */ -const QSet<QClass *> *QClass::superClasses() const +const QSet<QClass *> &QClass::superClasses() const { // This is a read-write derived association end qWarning("QClass::superClasses: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QClass *>); // change here to your derived return } void QClass::addSuperClass(QClass *superClass) @@ -285,48 +279,12 @@ void QClass::removeSuperClass(QClass *superClass) /*! The inherit operation is overridden to exclude redefined properties. */ -const QSet<QNamedElement *> *QClass::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QClass::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QClass::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return -} - -void QClass::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QNamedElement *>); // change here to your derived return } #include "moc_qclass.cpp" diff --git a/src/mof/qclass.h b/src/mof/qclass.h index 8f0407cf..8540743e 100644 --- a/src/mof/qclass.h +++ b/src/mof/qclass.h @@ -68,10 +68,10 @@ class Q_MOF_EXPORT QClass : public QClassifier Q_OBJECT Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(const QList<QClassifier *> * nestedClassifiers READ nestedClassifiers) - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) - Q_PROPERTY(const QSet<QClass *> * superClasses READ superClasses STORED false) + Q_PROPERTY(QList<QClassifier *> nestedClassifiers READ nestedClassifiers) + Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QSet<QClass *> superClasses READ superClasses STORED false) Q_DISABLE_COPY(QClass) Q_DECLARE_PRIVATE(QClass) @@ -86,22 +86,21 @@ public: Q_INVOKABLE void unsetAbstract(); // Association ends from QClass - Q_INVOKABLE const QList<QClassifier *> *nestedClassifiers() const; + Q_INVOKABLE const QList<QClassifier *> &nestedClassifiers() const; Q_INVOKABLE void addNestedClassifier(QClassifier *nestedClassifier); Q_INVOKABLE void removeNestedClassifier(QClassifier *nestedClassifier); - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); - Q_INVOKABLE const QSet<QClass *> *superClasses() const; + Q_INVOKABLE const QSet<QClass *> &superClasses() const; Q_INVOKABLE void addSuperClass(QClass *superClass); Q_INVOKABLE void removeSuperClass(QClass *superClass); // Operations - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; protected: explicit QClass(QClassPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -109,10 +108,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QClass) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *) - QT_END_HEADER #endif // QTMOF_QCLASS_H diff --git a/src/mof/qclass_p.h b/src/mof/qclass_p.h index f070bb5d..bf959ead 100644 --- a/src/mof/qclass_p.h +++ b/src/mof/qclass_p.h @@ -71,9 +71,9 @@ public: virtual ~QClassPrivate(); bool isAbstract; - QList<QClassifier *> *nestedClassifiers; - QList<QOperation *> *ownedOperations; - QList<QProperty *> *ownedAttributes; + QList<QClassifier *> nestedClassifiers; + QList<QOperation *> ownedOperations; + QList<QProperty *> ownedAttributes; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qclassifier.cpp b/src/mof/qclassifier.cpp index d340c429..5c8999e0 100644 --- a/src/mof/qclassifier.cpp +++ b/src/mof/qclassifier.cpp @@ -53,28 +53,20 @@ QT_BEGIN_NAMESPACE_QTMOF QClassifierPrivate::QClassifierPrivate() : isAbstract(false), - isFinalSpecialization(false), - attributes(new QSet<QProperty *>), - features(new QSet<QFeature *>), - redefinedClassifiers(new QSet<QClassifier *>), - generalizations(new QSet<QGeneralization *>) + isFinalSpecialization(false) { } QClassifierPrivate::~QClassifierPrivate() { - delete attributes; - delete features; - delete redefinedClassifiers; - delete generalizations; } void QClassifierPrivate::addAttribute(QProperty *attribute) { // This is a read-only derived-union association end - if (!this->attributes->contains(attribute)) { - this->attributes->insert(attribute); + if (!this->attributes.contains(attribute)) { + this->attributes.insert(attribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(this))->addFeature(qwrappedobject_cast<QFeature *>(attribute)); @@ -85,8 +77,8 @@ void QClassifierPrivate::removeAttribute(QProperty *attribute) { // This is a read-only derived-union association end - if (this->attributes->contains(attribute)) { - this->attributes->remove(attribute); + if (this->attributes.contains(attribute)) { + this->attributes.remove(attribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(this))->removeFeature(qwrappedobject_cast<QFeature *>(attribute)); @@ -97,8 +89,8 @@ void QClassifierPrivate::addFeature(QFeature *feature) { // This is a read-only derived-union association end - if (!this->features->contains(feature)) { - this->features->insert(feature); + if (!this->features.contains(feature)) { + this->features.insert(feature); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->addMember(qwrappedobject_cast<QNamedElement *>(feature)); @@ -113,8 +105,8 @@ void QClassifierPrivate::removeFeature(QFeature *feature) { // This is a read-only derived-union association end - if (this->features->contains(feature)) { - this->features->remove(feature); + if (this->features.contains(feature)) { + this->features.remove(feature); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(this))->removeMember(qwrappedobject_cast<QNamedElement *>(feature)); @@ -161,7 +153,7 @@ QClassifier::~QClassifier() /*! The Elements owned by this element. */ -const QSet<QElement *> *QClassifier::ownedElements() const +const QSet<QElement *> &QClassifier::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -177,7 +169,7 @@ QElement *QClassifier::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QClassifier::ownedComments() const +const QSet<QComment *> &QClassifier::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -297,7 +289,7 @@ void QClassifier::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const +const QSet<QRedefinableElement *> &QClassifier::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -305,7 +297,7 @@ const QSet<QRedefinableElement *> *QClassifier::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QClassifier::redefinitionContexts() const +const QSet<QClassifier *> &QClassifier::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -317,7 +309,7 @@ const QSet<QClassifier *> *QClassifier::redefinitionContexts() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QClassifier::packageImports() const +const QSet<QPackageImport *> &QClassifier::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -335,7 +327,7 @@ void QClassifier::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QClassifier::members() const +const QSet<QNamedElement *> &QClassifier::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -343,7 +335,7 @@ const QSet<QNamedElement *> *QClassifier::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QClassifier::importedMembers() const +const QSet<QPackageableElement *> &QClassifier::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -351,7 +343,7 @@ const QSet<QPackageableElement *> *QClassifier::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QClassifier::elementImports() const +const QSet<QElementImport *> &QClassifier::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -369,7 +361,7 @@ void QClassifier::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QClassifier::ownedRules() const +const QSet<QConstraint *> &QClassifier::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -387,7 +379,7 @@ void QClassifier::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QClassifier::ownedMembers() const +const QSet<QNamedElement *> &QClassifier::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -455,7 +447,7 @@ void QClassifier::unsetFinalSpecialization() /*! Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier. */ -const QSet<QProperty *> *QClassifier::attributes() const +const QSet<QProperty *> &QClassifier::attributes() const { // This is a read-only derived-union association end @@ -466,7 +458,7 @@ const QSet<QProperty *> *QClassifier::attributes() const /*! Specifies each feature defined in the classifier. */ -const QSet<QFeature *> *QClassifier::features() const +const QSet<QFeature *> &QClassifier::features() const { // This is a read-only derived-union association end @@ -477,13 +469,13 @@ const QSet<QFeature *> *QClassifier::features() const /*! Specifies the general Classifiers for this Classifier. */ -const QSet<QClassifier *> *QClassifier::generals() const +const QSet<QClassifier *> &QClassifier::generals() const { // This is a read-write derived association end qWarning("QClassifier::generals: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QClassifier *>); // change here to your derived return } void QClassifier::addGeneral(QClassifier *general) @@ -513,7 +505,7 @@ void QClassifier::removeGeneral(QClassifier *general) /*! References the Classifiers that are redefined by this Classifier. */ -const QSet<QClassifier *> *QClassifier::redefinedClassifiers() const +const QSet<QClassifier *> &QClassifier::redefinedClassifiers() const { // This is a read-write association end @@ -526,8 +518,8 @@ void QClassifier::addRedefinedClassifier(QClassifier *redefinedClassifier) // This is a read-write association end Q_D(QClassifier); - if (!d->redefinedClassifiers->contains(redefinedClassifier)) { - d->redefinedClassifiers->insert(redefinedClassifier); + if (!d->redefinedClassifiers.contains(redefinedClassifier)) { + d->redefinedClassifiers.insert(redefinedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); @@ -539,8 +531,8 @@ void QClassifier::removeRedefinedClassifier(QClassifier *redefinedClassifier) // This is a read-write association end Q_D(QClassifier); - if (d->redefinedClassifiers->contains(redefinedClassifier)) { - d->redefinedClassifiers->remove(redefinedClassifier); + if (d->redefinedClassifiers.contains(redefinedClassifier)) { + d->redefinedClassifiers.remove(redefinedClassifier); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedClassifier)); @@ -550,19 +542,19 @@ void QClassifier::removeRedefinedClassifier(QClassifier *redefinedClassifier) /*! Specifies all elements inherited by this classifier from the general classifiers. */ -const QSet<QNamedElement *> *QClassifier::inheritedMembers() const +const QSet<QNamedElement *> &QClassifier::inheritedMembers() const { // This is a read-only derived association end qWarning("QClassifier::inheritedMembers: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy. */ -const QSet<QGeneralization *> *QClassifier::generalizations() const +const QSet<QGeneralization *> &QClassifier::generalizations() const { // This is a read-write association end @@ -575,8 +567,8 @@ void QClassifier::addGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QClassifier); - if (!d->generalizations->contains(generalization)) { - d->generalizations->insert(generalization); + if (!d->generalizations.contains(generalization)) { + d->generalizations.insert(generalization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(generalization)); @@ -591,8 +583,8 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) // This is a read-write association end Q_D(QClassifier); - if (d->generalizations->contains(generalization)) { - d->generalizations->remove(generalization); + if (d->generalizations.contains(generalization)) { + d->generalizations.remove(generalization); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(generalization)); @@ -605,21 +597,21 @@ void QClassifier::removeGeneralization(QGeneralization *generalization) /*! The query allFeatures() gives all of the features in the namespace of the classifier. In general, through mechanisms such as inheritance, this will be a larger set than feature. */ -const QSet<QFeature *> *QClassifier::allFeatures() const +const QSet<QFeature *> &QClassifier::allFeatures() const { qWarning("QClassifier::allFeatures: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QFeature *>); // change here to your derived return } /*! The query allParents() gives all of the direct and indirect ancestors of a generalized Classifier. */ -const QSet<QClassifier *> *QClassifier::allParents() const +const QSet<QClassifier *> &QClassifier::allParents() const { qWarning("QClassifier::allParents: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QClassifier *>); // change here to your derived return } /*! @@ -647,23 +639,23 @@ bool QClassifier::hasVisibilityOf(const QNamedElement *n) const /*! The query inherit() defines how to inherit a set of elements. Here the operation is defined to inherit them all. It is intended to be redefined in circumstances where inheritance is affected by redefinition. */ -const QSet<QNamedElement *> *QClassifier::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QClassifier::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QClassifier::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! The query inheritableMembers() gives all of the members of a classifier that may be inherited in one of its descendants, subject to whatever visibility restrictions apply. */ -const QSet<QNamedElement *> *QClassifier::inheritableMembers(const QClassifier *c) const +const QSet<QNamedElement *> &QClassifier::inheritableMembers(const QClassifier *c) const { qWarning("QClassifier::inheritableMembers: operation to be implemented"); Q_UNUSED(c); - return 0; // change here to your derived return + return *(new QSet<QNamedElement *>); // change here to your derived return } /*! @@ -680,54 +672,11 @@ bool QClassifier::maySpecializeType(const QClassifier *c) const /*! The query parents() gives all of the immediate ancestors of a generalized Classifier. */ -const QSet<QClassifier *> *QClassifier::parents() const +const QSet<QClassifier *> &QClassifier::parents() const { qWarning("QClassifier::parents: operation to be implemented"); - return 0; // change here to your derived return -} - -void QClassifier::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *>("QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<QGeneralization *>("QGeneralization *"); - qRegisterMetaType<const QSet<QGeneralization *> *>("const QSet<QGeneralization *> *"); - qRegisterMetaType<const QList<QGeneralization *> *>("const QList<QGeneralization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<QFeature *>("QFeature *"); - qRegisterMetaType<const QSet<QFeature *> *>("const QSet<QFeature *> *"); - qRegisterMetaType<const QList<QFeature *> *>("const QList<QFeature *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QClassifier *>); // change here to your derived return } #include "moc_qclassifier.cpp" diff --git a/src/mof/qclassifier.h b/src/mof/qclassifier.h index 211c8eae..e6ca857a 100644 --- a/src/mof/qclassifier.h +++ b/src/mof/qclassifier.h @@ -73,12 +73,12 @@ class Q_MOF_EXPORT QClassifier : public QWrappedObject Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(const QSet<QProperty *> * attributes READ attributes) - Q_PROPERTY(const QSet<QFeature *> * features READ features) - Q_PROPERTY(const QSet<QClassifier *> * generals READ generals STORED false) - Q_PROPERTY(const QSet<QClassifier *> * redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(const QSet<QNamedElement *> * inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(const QSet<QGeneralization *> * generalizations READ generalizations) + Q_PROPERTY(QSet<QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QFeature *> features READ features) + Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) + Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) Q_DISABLE_COPY(QClassifier) Q_DECLARE_PRIVATE(QClassifier) @@ -88,9 +88,9 @@ public: virtual ~QClassifier(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -117,22 +117,22 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from QClassifier Q_INVOKABLE bool isAbstract() const; @@ -143,29 +143,28 @@ public: Q_INVOKABLE void unsetFinalSpecialization(); // Association ends from QClassifier - Q_INVOKABLE const QSet<QProperty *> *attributes() const; - Q_INVOKABLE const QSet<QFeature *> *features() const; - Q_INVOKABLE const QSet<QClassifier *> *generals() const; + Q_INVOKABLE const QSet<QProperty *> &attributes() const; + Q_INVOKABLE const QSet<QFeature *> &features() const; + Q_INVOKABLE const QSet<QClassifier *> &generals() const; Q_INVOKABLE void addGeneral(QClassifier *general); Q_INVOKABLE void removeGeneral(QClassifier *general); - Q_INVOKABLE const QSet<QClassifier *> *redefinedClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinedClassifiers() const; Q_INVOKABLE void addRedefinedClassifier(QClassifier *redefinedClassifier); Q_INVOKABLE void removeRedefinedClassifier(QClassifier *redefinedClassifier); - Q_INVOKABLE const QSet<QNamedElement *> *inheritedMembers() const; - Q_INVOKABLE const QSet<QGeneralization *> *generalizations() const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritedMembers() const; + Q_INVOKABLE const QSet<QGeneralization *> &generalizations() const; Q_INVOKABLE void addGeneralization(QGeneralization *generalization); Q_INVOKABLE void removeGeneralization(QGeneralization *generalization); // Operations - Q_INVOKABLE const QSet<QFeature *> *allFeatures() const; - Q_INVOKABLE const QSet<QClassifier *> *allParents() const; + Q_INVOKABLE const QSet<QFeature *> &allFeatures() const; + Q_INVOKABLE const QSet<QClassifier *> &allParents() const; Q_INVOKABLE bool conformsTo(const QClassifier *other) const; Q_INVOKABLE bool hasVisibilityOf(const QNamedElement *n) const; - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - Q_INVOKABLE const QSet<QNamedElement *> *inheritableMembers(const QClassifier *c) const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; + Q_INVOKABLE const QSet<QNamedElement *> &inheritableMembers(const QClassifier *c) const; Q_INVOKABLE bool maySpecializeType(const QClassifier *c) const; - Q_INVOKABLE const QSet<QClassifier *> *parents() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QClassifier *> &parents() const; // Classes which access read-only opposite properties should be friend friend class QFeaturePrivate; @@ -181,10 +180,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *) - QT_END_HEADER #endif // QTMOF_QCLASSIFIER_H diff --git a/src/mof/qclassifier_p.h b/src/mof/qclassifier_p.h index f9860274..5b48f9fe 100644 --- a/src/mof/qclassifier_p.h +++ b/src/mof/qclassifier_p.h @@ -76,10 +76,10 @@ public: bool isAbstract; bool isFinalSpecialization; - QSet<QProperty *> *attributes; - QSet<QFeature *> *features; - QSet<QClassifier *> *redefinedClassifiers; - QSet<QGeneralization *> *generalizations; + QSet<QProperty *> attributes; + QSet<QFeature *> features; + QSet<QClassifier *> redefinedClassifiers; + QSet<QGeneralization *> generalizations; // Internal functions for read-only subsetted association ends void addAttribute(QProperty *attribute); diff --git a/src/mof/qcomment.cpp b/src/mof/qcomment.cpp index 24b759eb..742b3cdd 100644 --- a/src/mof/qcomment.cpp +++ b/src/mof/qcomment.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QCommentPrivate::QCommentPrivate() : - annotatedElements(new QSet<QElement *>) +QCommentPrivate::QCommentPrivate() { } QCommentPrivate::~QCommentPrivate() { - delete annotatedElements; } /*! @@ -108,7 +106,7 @@ void QComment::setBody(QString body) /*! References the Element(s) being commented. */ -const QSet<QElement *> *QComment::annotatedElements() const +const QSet<QElement *> &QComment::annotatedElements() const { // This is a read-write association end @@ -121,8 +119,8 @@ void QComment::addAnnotatedElement(QElement *annotatedElement) // This is a read-write association end Q_D(QComment); - if (!d->annotatedElements->contains(annotatedElement)) { - d->annotatedElements->insert(annotatedElement); + if (!d->annotatedElements.contains(annotatedElement)) { + d->annotatedElements.insert(annotatedElement); } } @@ -131,26 +129,11 @@ void QComment::removeAnnotatedElement(QElement *annotatedElement) // This is a read-write association end Q_D(QComment); - if (d->annotatedElements->contains(annotatedElement)) { - d->annotatedElements->remove(annotatedElement); + if (d->annotatedElements.contains(annotatedElement)) { + d->annotatedElements.remove(annotatedElement); } } -void QComment::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QComment) *>("QT_PREPEND_NAMESPACE_QTMOF(QComment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<QComment *>("QComment *"); - qRegisterMetaType<const QSet<QComment *> *>("const QSet<QComment *> *"); - qRegisterMetaType<const QList<QComment *> *>("const QList<QComment *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qcomment.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qcomment.h b/src/mof/qcomment.h index f01b3f34..9f3b44de 100644 --- a/src/mof/qcomment.h +++ b/src/mof/qcomment.h @@ -63,7 +63,7 @@ class Q_MOF_EXPORT QComment : public QElement Q_OBJECT Q_PROPERTY(QString body READ body WRITE setBody) - Q_PROPERTY(const QSet<QElement *> * annotatedElements READ annotatedElements) + Q_PROPERTY(QSet<QElement *> annotatedElements READ annotatedElements) Q_DISABLE_COPY(QComment) Q_DECLARE_PRIVATE(QComment) @@ -77,10 +77,9 @@ public: Q_INVOKABLE void setBody(QString body); // Association ends from QComment - Q_INVOKABLE const QSet<QElement *> *annotatedElements() const; + Q_INVOKABLE const QSet<QElement *> &annotatedElements() const; Q_INVOKABLE void addAnnotatedElement(QElement *annotatedElement); Q_INVOKABLE void removeAnnotatedElement(QElement *annotatedElement); - virtual void registerMetaTypes() const; protected: explicit QComment(QCommentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QComment) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *) - QT_END_HEADER #endif // QTMOF_QCOMMENT_H diff --git a/src/mof/qcomment_p.h b/src/mof/qcomment_p.h index 0b545da1..16bcb9a6 100644 --- a/src/mof/qcomment_p.h +++ b/src/mof/qcomment_p.h @@ -66,7 +66,7 @@ public: virtual ~QCommentPrivate(); QString body; - QSet<QElement *> *annotatedElements; + QSet<QElement *> annotatedElements; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qconstraint.cpp b/src/mof/qconstraint.cpp index 21d39216..2582d05e 100644 --- a/src/mof/qconstraint.cpp +++ b/src/mof/qconstraint.cpp @@ -50,14 +50,12 @@ QT_BEGIN_NAMESPACE_QTMOF QConstraintPrivate::QConstraintPrivate() : context(0), - specification(0), - constrainedElements(new QList<QElement *>) + specification(0) { } QConstraintPrivate::~QConstraintPrivate() { - delete constrainedElements; } /*! @@ -150,7 +148,7 @@ void QConstraint::setSpecification(QValueSpecification *specification) /*! The ordered set of Elements referenced by this Constraint. */ -const QList<QElement *> *QConstraint::constrainedElements() const +const QList<QElement *> &QConstraint::constrainedElements() const { // This is a read-write association end @@ -163,8 +161,8 @@ void QConstraint::addConstrainedElement(QElement *constrainedElement) // This is a read-write association end Q_D(QConstraint); - if (!d->constrainedElements->contains(constrainedElement)) { - d->constrainedElements->append(constrainedElement); + if (!d->constrainedElements.contains(constrainedElement)) { + d->constrainedElements.append(constrainedElement); } } @@ -173,47 +171,11 @@ void QConstraint::removeConstrainedElement(QElement *constrainedElement) // This is a read-write association end Q_D(QConstraint); - if (d->constrainedElements->contains(constrainedElement)) { - d->constrainedElements->removeAll(constrainedElement); + if (d->constrainedElements.contains(constrainedElement)) { + d->constrainedElements.removeAll(constrainedElement); } } -void QConstraint::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *>("QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qconstraint.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qconstraint.h b/src/mof/qconstraint.h index e4185e4a..bcc59af2 100644 --- a/src/mof/qconstraint.h +++ b/src/mof/qconstraint.h @@ -68,7 +68,7 @@ class Q_MOF_EXPORT QConstraint : public QPackageableElement Q_PROPERTY(QNamespace * context READ context WRITE setContext) Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(const QList<QElement *> * constrainedElements READ constrainedElements) + Q_PROPERTY(QList<QElement *> constrainedElements READ constrainedElements) Q_DISABLE_COPY(QConstraint) Q_DECLARE_PRIVATE(QConstraint) @@ -82,10 +82,9 @@ public: Q_INVOKABLE void setContext(QNamespace *context); Q_INVOKABLE QValueSpecification *specification() const; Q_INVOKABLE void setSpecification(QValueSpecification *specification); - Q_INVOKABLE const QList<QElement *> *constrainedElements() const; + Q_INVOKABLE const QList<QElement *> &constrainedElements() const; Q_INVOKABLE void addConstrainedElement(QElement *constrainedElement); Q_INVOKABLE void removeConstrainedElement(QElement *constrainedElement); - virtual void registerMetaTypes() const; protected: explicit QConstraint(QConstraintPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *) - QT_END_HEADER #endif // QTMOF_QCONSTRAINT_H diff --git a/src/mof/qconstraint_p.h b/src/mof/qconstraint_p.h index d23761e2..c5595ed9 100644 --- a/src/mof/qconstraint_p.h +++ b/src/mof/qconstraint_p.h @@ -71,7 +71,7 @@ public: QNamespace *context; QValueSpecification *specification; - QList<QElement *> *constrainedElements; + QList<QElement *> constrainedElements; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdatatype.cpp b/src/mof/qdatatype.cpp index 941f21d8..75b8a1d0 100644 --- a/src/mof/qdatatype.cpp +++ b/src/mof/qdatatype.cpp @@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QDataTypePrivate::QDataTypePrivate() : - ownedOperations(new QList<QOperation *>), - ownedAttributes(new QList<QProperty *>) +QDataTypePrivate::QDataTypePrivate() { } QDataTypePrivate::~QDataTypePrivate() { - delete ownedOperations; - delete ownedAttributes; } /*! @@ -89,7 +85,7 @@ QDataType::~QDataType() /*! The Operations owned by the DataType. */ -const QList<QOperation *> *QDataType::ownedOperations() const +const QList<QOperation *> &QDataType::ownedOperations() const { // This is a read-write association end @@ -102,8 +98,8 @@ void QDataType::addOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QDataType); - if (!d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->append(ownedOperation); + if (!d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.append(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -119,8 +115,8 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) // This is a read-write association end Q_D(QDataType); - if (d->ownedOperations->contains(ownedOperation)) { - d->ownedOperations->removeAll(ownedOperation); + if (d->ownedOperations.contains(ownedOperation)) { + d->ownedOperations.removeAll(ownedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeFeature(qwrappedobject_cast<QFeature *>(ownedOperation)); @@ -134,7 +130,7 @@ void QDataType::removeOwnedOperation(QOperation *ownedOperation) /*! The Attributes owned by the DataType. */ -const QList<QProperty *> *QDataType::ownedAttributes() const +const QList<QProperty *> &QDataType::ownedAttributes() const { // This is a read-write association end @@ -147,8 +143,8 @@ void QDataType::addOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QDataType); - if (!d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->append(ownedAttribute); + if (!d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.append(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->addAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -164,8 +160,8 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) // This is a read-write association end Q_D(QDataType); - if (d->ownedAttributes->contains(ownedAttribute)) { - d->ownedAttributes->removeAll(ownedAttribute); + if (d->ownedAttributes.contains(ownedAttribute)) { + d->ownedAttributes.removeAll(ownedAttribute); // Adjust subsetted property(ies) (qwrappedobject_cast<QClassifierPrivate *>(d))->removeAttribute(qwrappedobject_cast<QProperty *>(ownedAttribute)); @@ -179,48 +175,12 @@ void QDataType::removeOwnedAttribute(QProperty *ownedAttribute) /*! The inherit operation is overridden to exclude redefined properties. */ -const QSet<QNamedElement *> *QDataType::inherit(const QSet<QNamedElement *> *inhs) const +const QSet<QNamedElement *> &QDataType::inherit(const QSet<QNamedElement *> &inhs) const { qWarning("QDataType::inherit: operation to be implemented"); Q_UNUSED(inhs); - return 0; // change here to your derived return -} - -void QDataType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - QClassifier::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QNamedElement *>); // change here to your derived return } #include "moc_qdatatype.cpp" diff --git a/src/mof/qdatatype.h b/src/mof/qdatatype.h index c9619ea6..d6f5cb74 100644 --- a/src/mof/qdatatype.h +++ b/src/mof/qdatatype.h @@ -67,8 +67,8 @@ class Q_MOF_EXPORT QDataType : public QClassifier { Q_OBJECT - Q_PROPERTY(const QList<QOperation *> * ownedOperations READ ownedOperations) - Q_PROPERTY(const QList<QProperty *> * ownedAttributes READ ownedAttributes) + Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QDataType) Q_DECLARE_PRIVATE(QDataType) @@ -78,16 +78,15 @@ public: virtual ~QDataType(); // Association ends from QDataType - Q_INVOKABLE const QList<QOperation *> *ownedOperations() const; + Q_INVOKABLE const QList<QOperation *> &ownedOperations() const; Q_INVOKABLE void addOwnedOperation(QOperation *ownedOperation); Q_INVOKABLE void removeOwnedOperation(QOperation *ownedOperation); - Q_INVOKABLE const QList<QProperty *> *ownedAttributes() const; + Q_INVOKABLE const QList<QProperty *> &ownedAttributes() const; Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute); Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute); // Operations - Q_INVOKABLE const QSet<QNamedElement *> *inherit(const QSet<QNamedElement *> *inhs) const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QNamedElement *> &inherit(const QSet<QNamedElement *> &inhs) const; protected: explicit QDataType(QDataTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QDataType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *) - QT_END_HEADER #endif // QTMOF_QDATATYPE_H diff --git a/src/mof/qdatatype_p.h b/src/mof/qdatatype_p.h index 1329854a..89281cfa 100644 --- a/src/mof/qdatatype_p.h +++ b/src/mof/qdatatype_p.h @@ -70,8 +70,8 @@ public: explicit QDataTypePrivate(); virtual ~QDataTypePrivate(); - QList<QOperation *> *ownedOperations; - QList<QProperty *> *ownedAttributes; + QList<QOperation *> ownedOperations; + QList<QProperty *> ownedAttributes; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdirectedrelationship.cpp b/src/mof/qdirectedrelationship.cpp index ccf76c10..d9628964 100644 --- a/src/mof/qdirectedrelationship.cpp +++ b/src/mof/qdirectedrelationship.cpp @@ -46,24 +46,20 @@ QT_BEGIN_NAMESPACE_QTMOF -QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() : - sources(new QSet<QElement *>), - targets(new QSet<QElement *>) +QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() { } QDirectedRelationshipPrivate::~QDirectedRelationshipPrivate() { - delete sources; - delete targets; } void QDirectedRelationshipPrivate::addSource(QElement *source) { // This is a read-only derived-union association end - if (!this->sources->contains(source)) { - this->sources->insert(source); + if (!this->sources.contains(source)) { + this->sources.insert(source); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(source)); @@ -74,8 +70,8 @@ void QDirectedRelationshipPrivate::removeSource(QElement *source) { // This is a read-only derived-union association end - if (this->sources->contains(source)) { - this->sources->remove(source); + if (this->sources.contains(source)) { + this->sources.remove(source); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(source)); @@ -86,8 +82,8 @@ void QDirectedRelationshipPrivate::addTarget(QElement *target) { // This is a read-only derived-union association end - if (!this->targets->contains(target)) { - this->targets->insert(target); + if (!this->targets.contains(target)) { + this->targets.insert(target); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->addRelatedElement(qwrappedobject_cast<QElement *>(target)); @@ -98,8 +94,8 @@ void QDirectedRelationshipPrivate::removeTarget(QElement *target) { // This is a read-only derived-union association end - if (this->targets->contains(target)) { - this->targets->remove(target); + if (this->targets.contains(target)) { + this->targets.remove(target); // Adjust subsetted property(ies) (qwrappedobject_cast<QRelationshipPrivate *>(this))->removeRelatedElement(qwrappedobject_cast<QElement *>(target)); @@ -135,7 +131,7 @@ QDirectedRelationship::~QDirectedRelationship() /*! Specifies the sources of the DirectedRelationship. */ -const QSet<QElement *> *QDirectedRelationship::sources() const +const QSet<QElement *> &QDirectedRelationship::sources() const { // This is a read-only derived-union association end @@ -146,7 +142,7 @@ const QSet<QElement *> *QDirectedRelationship::sources() const /*! Specifies the targets of the DirectedRelationship. */ -const QSet<QElement *> *QDirectedRelationship::targets() const +const QSet<QElement *> &QDirectedRelationship::targets() const { // This is a read-only derived-union association end @@ -154,28 +150,6 @@ const QSet<QElement *> *QDirectedRelationship::targets() const return d->targets; } -void QDirectedRelationship::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *>("QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *"); - qRegisterMetaType<QDirectedRelationship *>("QDirectedRelationship *"); - qRegisterMetaType<const QSet<QDirectedRelationship *> *>("const QSet<QDirectedRelationship *> *"); - qRegisterMetaType<const QList<QDirectedRelationship *> *>("const QList<QDirectedRelationship *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qdirectedrelationship.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qdirectedrelationship.h b/src/mof/qdirectedrelationship.h index 7c9b390e..8416167b 100644 --- a/src/mof/qdirectedrelationship.h +++ b/src/mof/qdirectedrelationship.h @@ -64,8 +64,8 @@ class Q_MOF_EXPORT QDirectedRelationship : public QRelationship { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * sources READ sources) - Q_PROPERTY(const QSet<QElement *> * targets READ targets) + Q_PROPERTY(QSet<QElement *> sources READ sources) + Q_PROPERTY(QSet<QElement *> targets READ targets) Q_DISABLE_COPY(QDirectedRelationship) Q_DECLARE_PRIVATE(QDirectedRelationship) @@ -75,9 +75,8 @@ public: virtual ~QDirectedRelationship(); // Association ends from QDirectedRelationship - Q_INVOKABLE const QSet<QElement *> *sources() const; - Q_INVOKABLE const QSet<QElement *> *targets() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QElement *> &sources() const; + Q_INVOKABLE const QSet<QElement *> &targets() const; protected: explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QDirectedRelationship) *> *) - QT_END_HEADER #endif // QTMOF_QDIRECTEDRELATIONSHIP_H diff --git a/src/mof/qdirectedrelationship_p.h b/src/mof/qdirectedrelationship_p.h index ca8392ea..b0a2ddbc 100644 --- a/src/mof/qdirectedrelationship_p.h +++ b/src/mof/qdirectedrelationship_p.h @@ -66,8 +66,8 @@ public: explicit QDirectedRelationshipPrivate(); virtual ~QDirectedRelationshipPrivate(); - QSet<QElement *> *sources; - QSet<QElement *> *targets; + QSet<QElement *> sources; + QSet<QElement *> targets; // Internal functions for read-only subsetted association ends void addSource(QElement *source); diff --git a/src/mof/qelement.cpp b/src/mof/qelement.cpp index a188727c..d3a31f04 100644 --- a/src/mof/qelement.cpp +++ b/src/mof/qelement.cpp @@ -48,24 +48,21 @@ QT_BEGIN_NAMESPACE_QTMOF QElementPrivate::QElementPrivate() : - ownedElements(new QSet<QElement *>), - owner(0), - ownedComments(new QSet<QComment *>) + owner(0) { } QElementPrivate::~QElementPrivate() { - delete ownedElements; - delete ownedComments; + qDeleteAll(ownedElements); } void QElementPrivate::addOwnedElement(QElement *ownedElement) { // This is a read-only derived-union association end - if (!this->ownedElements->contains(ownedElement)) { - this->ownedElements->insert(ownedElement); + if (!this->ownedElements.contains(ownedElement)) { + this->ownedElements.insert(ownedElement); Q_Q(QElement); qTopLevelWrapper(ownedElement)->setParent(qTopLevelWrapper(q)); @@ -78,8 +75,8 @@ void QElementPrivate::removeOwnedElement(QElement *ownedElement) { // This is a read-only derived-union association end - if (this->ownedElements->contains(ownedElement)) { - this->ownedElements->remove(ownedElement); + if (this->ownedElements.contains(ownedElement)) { + this->ownedElements.remove(ownedElement); qTopLevelWrapper(ownedElement)->setParent(0); // Adjust opposite property @@ -134,7 +131,7 @@ QElement::~QElement() /*! The Elements owned by this element. */ -const QSet<QElement *> *QElement::ownedElements() const +const QSet<QElement *> &QElement::ownedElements() const { // This is a read-only derived-union association end @@ -156,7 +153,7 @@ QElement *QElement::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QElement::ownedComments() const +const QSet<QComment *> &QElement::ownedComments() const { // This is a read-write association end @@ -169,8 +166,8 @@ void QElement::addOwnedComment(QComment *ownedComment) // This is a read-write association end Q_D(QElement); - if (!d->ownedComments->contains(ownedComment)) { - d->ownedComments->insert(ownedComment); + if (!d->ownedComments.contains(ownedComment)) { + d->ownedComments.insert(ownedComment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); @@ -182,8 +179,8 @@ void QElement::removeOwnedComment(QComment *ownedComment) // This is a read-write association end Q_D(QElement); - if (d->ownedComments->contains(ownedComment)) { - d->ownedComments->remove(ownedComment); + if (d->ownedComments.contains(ownedComment)) { + d->ownedComments.remove(ownedComment); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedComment)); @@ -193,11 +190,11 @@ void QElement::removeOwnedComment(QComment *ownedComment) /*! The query allOwnedElements() gives all of the direct and indirect owned elements of an element. */ -const QSet<QElement *> *QElement::allOwnedElements() const +const QSet<QElement *> &QElement::allOwnedElements() const { qWarning("QElement::allOwnedElements: operation to be implemented"); - return 0; // change here to your derived return + return *(new QSet<QElement *>); // change here to your derived return } /*! @@ -238,35 +235,6 @@ void QElement::delete_() qWarning("QElement::delete_: operation to be implemented"); } -void QElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QComment) *>("QT_PREPEND_NAMESPACE_QTMOF(QComment) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QComment) *> *"); - qRegisterMetaType<QComment *>("QComment *"); - qRegisterMetaType<const QSet<QComment *> *>("const QSet<QComment *> *"); - qRegisterMetaType<const QList<QComment *> *>("const QList<QComment *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qelement.h b/src/mof/qelement.h index e06e826b..52fc49a8 100644 --- a/src/mof/qelement.h +++ b/src/mof/qelement.h @@ -65,9 +65,9 @@ class Q_MOF_EXPORT QElement : public QMofObject { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * ownedElements READ ownedElements) + Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(const QSet<QComment *> * ownedComments READ ownedComments) + Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) Q_DISABLE_COPY(QElement) Q_DECLARE_PRIVATE(QElement) @@ -77,20 +77,19 @@ public: virtual ~QElement(); // Association ends from QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); // Operations - Q_INVOKABLE const QSet<QElement *> *allOwnedElements() const; + Q_INVOKABLE const QSet<QElement *> &allOwnedElements() const; Q_INVOKABLE bool mustBeOwned() const; Q_INVOKABLE QClass *getMetaClass() const; Q_INVOKABLE QElement *container() const; Q_INVOKABLE bool isInstanceOfType(const QClass *type, bool includesSubtypes) const; Q_INVOKABLE void delete_(); - virtual void registerMetaTypes() const; protected: explicit QElement(QElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *) - QT_END_HEADER #endif // QTMOF_QELEMENT_H diff --git a/src/mof/qelement_p.h b/src/mof/qelement_p.h index 2c894cab..f565b16b 100644 --- a/src/mof/qelement_p.h +++ b/src/mof/qelement_p.h @@ -68,9 +68,9 @@ public: explicit QElementPrivate(); virtual ~QElementPrivate(); - QSet<QElement *> *ownedElements; + QSet<QElement *> ownedElements; QElement *owner; - QSet<QComment *> *ownedComments; + QSet<QComment *> ownedComments; // Internal functions for read-only subsetted association ends void addOwnedElement(QElement *ownedElement); diff --git a/src/mof/qelementimport.cpp b/src/mof/qelementimport.cpp index b36af236..0eb22615 100644 --- a/src/mof/qelementimport.cpp +++ b/src/mof/qelementimport.cpp @@ -212,35 +212,6 @@ QString QElementImport::getName() const return QString(); // change here to your derived return } -void QElementImport::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<QElementImport *>("QElementImport *"); - qRegisterMetaType<const QSet<QElementImport *> *>("const QSet<QElementImport *> *"); - qRegisterMetaType<const QList<QElementImport *> *>("const QList<QElementImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qelementimport.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qelementimport.h b/src/mof/qelementimport.h index ce14b6d4..fff3b290 100644 --- a/src/mof/qelementimport.h +++ b/src/mof/qelementimport.h @@ -95,7 +95,6 @@ public: // Operations Q_INVOKABLE QString getName() const; - virtual void registerMetaTypes() const; protected: explicit QElementImport(QElementImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -103,10 +102,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *) - QT_END_HEADER #endif // QTMOF_QELEMENTIMPORT_H diff --git a/src/mof/qenumeration.cpp b/src/mof/qenumeration.cpp index 7a1c3322..30455559 100644 --- a/src/mof/qenumeration.cpp +++ b/src/mof/qenumeration.cpp @@ -46,14 +46,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QEnumerationPrivate::QEnumerationPrivate() : - ownedLiterals(new QList<QEnumerationLiteral *>) +QEnumerationPrivate::QEnumerationPrivate() { } QEnumerationPrivate::~QEnumerationPrivate() { - delete ownedLiterals; } /*! @@ -85,7 +83,7 @@ QEnumeration::~QEnumeration() /*! The ordered set of literals for this Enumeration. */ -const QList<QEnumerationLiteral *> *QEnumeration::ownedLiterals() const +const QList<QEnumerationLiteral *> &QEnumeration::ownedLiterals() const { // This is a read-write association end @@ -98,8 +96,8 @@ void QEnumeration::addOwnedLiteral(QEnumerationLiteral *ownedLiteral) // This is a read-write association end Q_D(QEnumeration); - if (!d->ownedLiterals->contains(ownedLiteral)) { - d->ownedLiterals->append(ownedLiteral); + if (!d->ownedLiterals.contains(ownedLiteral)) { + d->ownedLiterals.append(ownedLiteral); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); @@ -114,8 +112,8 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) // This is a read-write association end Q_D(QEnumeration); - if (d->ownedLiterals->contains(ownedLiteral)) { - d->ownedLiterals->removeAll(ownedLiteral); + if (d->ownedLiterals.contains(ownedLiteral)) { + d->ownedLiterals.removeAll(ownedLiteral); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedLiteral)); @@ -125,28 +123,6 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) } } -void QEnumeration::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<QEnumeration *>("QEnumeration *"); - qRegisterMetaType<const QSet<QEnumeration *> *>("const QSet<QEnumeration *> *"); - qRegisterMetaType<const QList<QEnumeration *> *>("const QList<QEnumeration *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *"); - qRegisterMetaType<const QSet<QEnumerationLiteral *> *>("const QSet<QEnumerationLiteral *> *"); - qRegisterMetaType<const QList<QEnumerationLiteral *> *>("const QList<QEnumerationLiteral *> *"); - - QDataType::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qenumeration.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumeration.h b/src/mof/qenumeration.h index ecfd86ed..ad81bd64 100644 --- a/src/mof/qenumeration.h +++ b/src/mof/qenumeration.h @@ -64,7 +64,7 @@ class Q_MOF_EXPORT QEnumeration : public QDataType { Q_OBJECT - Q_PROPERTY(const QList<QEnumerationLiteral *> * ownedLiterals READ ownedLiterals) + Q_PROPERTY(QList<QEnumerationLiteral *> ownedLiterals READ ownedLiterals) Q_DISABLE_COPY(QEnumeration) Q_DECLARE_PRIVATE(QEnumeration) @@ -74,10 +74,9 @@ public: virtual ~QEnumeration(); // Association ends from QEnumeration - Q_INVOKABLE const QList<QEnumerationLiteral *> *ownedLiterals() const; + Q_INVOKABLE const QList<QEnumerationLiteral *> &ownedLiterals() const; Q_INVOKABLE void addOwnedLiteral(QEnumerationLiteral *ownedLiteral); Q_INVOKABLE void removeOwnedLiteral(QEnumerationLiteral *ownedLiteral); - virtual void registerMetaTypes() const; protected: explicit QEnumeration(QEnumerationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *) - QT_END_HEADER #endif // QTMOF_QENUMERATION_H diff --git a/src/mof/qenumeration_p.h b/src/mof/qenumeration_p.h index c882c68d..228804d4 100644 --- a/src/mof/qenumeration_p.h +++ b/src/mof/qenumeration_p.h @@ -67,7 +67,7 @@ public: explicit QEnumerationPrivate(); virtual ~QEnumerationPrivate(); - QList<QEnumerationLiteral *> *ownedLiterals; + QList<QEnumerationLiteral *> ownedLiterals; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumerationliteral.cpp b/src/mof/qenumerationliteral.cpp index abed2d9c..13a10720 100644 --- a/src/mof/qenumerationliteral.cpp +++ b/src/mof/qenumerationliteral.cpp @@ -125,28 +125,6 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration) } } -void QEnumerationLiteral::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *"); - qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *"); - qRegisterMetaType<const QSet<QEnumerationLiteral *> *>("const QSet<QEnumerationLiteral *> *"); - qRegisterMetaType<const QList<QEnumerationLiteral *> *>("const QList<QEnumerationLiteral *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *>("QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumeration) *> *"); - qRegisterMetaType<QEnumeration *>("QEnumeration *"); - qRegisterMetaType<const QSet<QEnumeration *> *>("const QSet<QEnumeration *> *"); - qRegisterMetaType<const QList<QEnumeration *> *>("const QList<QEnumeration *> *"); - - QInstanceSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qenumerationliteral.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qenumerationliteral.h b/src/mof/qenumerationliteral.h index 8e7e3abe..70f32416 100644 --- a/src/mof/qenumerationliteral.h +++ b/src/mof/qenumerationliteral.h @@ -75,7 +75,6 @@ public: Q_INVOKABLE QEnumeration *classifier() const; Q_INVOKABLE QEnumeration *enumeration() const; Q_INVOKABLE void setEnumeration(QEnumeration *enumeration); - virtual void registerMetaTypes() const; protected: explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QEnumerationLiteral) *> *) - QT_END_HEADER #endif // QTMOF_QENUMERATIONLITERAL_H diff --git a/src/mof/qexception.cpp b/src/mof/qexception.cpp index e026926d..67810cd0 100644 --- a/src/mof/qexception.cpp +++ b/src/mof/qexception.cpp @@ -129,28 +129,6 @@ void QException::setObjectInError(QElement *objectInError) } } -void QException::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QException) *>("QT_PREPEND_NAMESPACE_QTMOF(QException) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *"); - qRegisterMetaType<QException *>("QException *"); - qRegisterMetaType<const QSet<QException *> *>("const QSet<QException *> *"); - qRegisterMetaType<const QList<QException *> *>("const QList<QException *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexception.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qexception.h b/src/mof/qexception.h index cf4d5bcb..a4d83977 100644 --- a/src/mof/qexception.h +++ b/src/mof/qexception.h @@ -83,7 +83,6 @@ public: Q_INVOKABLE void setElementInError(QElement *elementInError); Q_INVOKABLE QElement *objectInError() const; Q_INVOKABLE void setObjectInError(QElement *objectInError); - virtual void registerMetaTypes() const; protected: explicit QException(QExceptionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -91,10 +90,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QException) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QException) *> *) - QT_END_HEADER #endif // QTMOF_QEXCEPTION_H diff --git a/src/mof/qexpression.cpp b/src/mof/qexpression.cpp index c2d4b255..4cd8f9da 100644 --- a/src/mof/qexpression.cpp +++ b/src/mof/qexpression.cpp @@ -44,14 +44,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QExpressionPrivate::QExpressionPrivate() : - operands(new QList<QValueSpecification *>) +QExpressionPrivate::QExpressionPrivate() { } QExpressionPrivate::~QExpressionPrivate() { - delete operands; } /*! @@ -108,7 +106,7 @@ void QExpression::setSymbol(QString symbol) /*! Specifies a sequence of operands. */ -const QList<QValueSpecification *> *QExpression::operands() const +const QList<QValueSpecification *> &QExpression::operands() const { // This is a read-write association end @@ -121,8 +119,8 @@ void QExpression::addOperand(QValueSpecification *operand) // This is a read-write association end Q_D(QExpression); - if (!d->operands->contains(operand)) { - d->operands->append(operand); + if (!d->operands.contains(operand)) { + d->operands.append(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(operand)); @@ -134,29 +132,14 @@ void QExpression::removeOperand(QValueSpecification *operand) // This is a read-write association end Q_D(QExpression); - if (d->operands->contains(operand)) { - d->operands->removeAll(operand); + if (d->operands.contains(operand)) { + d->operands.removeAll(operand); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(operand)); } } -void QExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *>("QT_PREPEND_NAMESPACE_QTMOF(QExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *"); - qRegisterMetaType<QExpression *>("QExpression *"); - qRegisterMetaType<const QSet<QExpression *> *>("const QSet<QExpression *> *"); - qRegisterMetaType<const QList<QExpression *> *>("const QList<QExpression *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qexpression.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qexpression.h b/src/mof/qexpression.h index eb9c128c..49bca05b 100644 --- a/src/mof/qexpression.h +++ b/src/mof/qexpression.h @@ -63,7 +63,7 @@ class Q_MOF_EXPORT QExpression : public QValueSpecification Q_OBJECT Q_PROPERTY(QString symbol READ symbol WRITE setSymbol) - Q_PROPERTY(const QList<QValueSpecification *> * operands READ operands) + Q_PROPERTY(QList<QValueSpecification *> operands READ operands) Q_DISABLE_COPY(QExpression) Q_DECLARE_PRIVATE(QExpression) @@ -77,10 +77,9 @@ public: Q_INVOKABLE void setSymbol(QString symbol); // Association ends from QExpression - Q_INVOKABLE const QList<QValueSpecification *> *operands() const; + Q_INVOKABLE const QList<QValueSpecification *> &operands() const; Q_INVOKABLE void addOperand(QValueSpecification *operand); Q_INVOKABLE void removeOperand(QValueSpecification *operand); - virtual void registerMetaTypes() const; protected: explicit QExpression(QExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -88,10 +87,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QExpression) *> *) - QT_END_HEADER #endif // QTMOF_QEXPRESSION_H diff --git a/src/mof/qexpression_p.h b/src/mof/qexpression_p.h index 21d7d97f..2de91824 100644 --- a/src/mof/qexpression_p.h +++ b/src/mof/qexpression_p.h @@ -66,7 +66,7 @@ public: virtual ~QExpressionPrivate(); QString symbol; - QList<QValueSpecification *> *operands; + QList<QValueSpecification *> operands; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qextent.cpp b/src/mof/qextent.cpp index e2bd60b0..01d18c88 100644 --- a/src/mof/qextent.cpp +++ b/src/mof/qextent.cpp @@ -87,31 +87,31 @@ QReflectiveSequence *QExtent::elements() const return 0; // change here to your derived return } -const QSet<QElement *> *QExtent::elementsOfType(const QClass *type, bool includesSubtypes) const +const QSet<QElement *> &QExtent::elementsOfType(const QClass *type, bool includesSubtypes) const { qWarning("QExtent::elementsOfType: operation to be implemented"); Q_UNUSED(type); Q_UNUSED(includesSubtypes); - return 0; // change here to your derived return + return *(new QSet<QElement *>); // change here to your derived return } -const QSet<QLink *> *QExtent::linksOfType(const QAssociation *type) const +const QSet<QLink *> &QExtent::linksOfType(const QAssociation *type) const { qWarning("QExtent::linksOfType: operation to be implemented"); Q_UNUSED(type); - return 0; // change here to your derived return + return *(new QSet<QLink *>); // change here to your derived return } -const QSet<QElement *> *QExtent::linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const +const QSet<QElement *> &QExtent::linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const { qWarning("QExtent::linkedElements: operation to be implemented"); Q_UNUSED(association); Q_UNUSED(endElement); Q_UNUSED(end1ToEnd2Direction); - return 0; // change here to your derived return + return *(new QSet<QElement *>); // change here to your derived return } bool QExtent::linkExists(const QAssociation *association, const QElement *firstElement, const QElement *secondElement) const @@ -124,56 +124,6 @@ bool QExtent::linkExists(const QAssociation *association, const QElement *firstE return bool(); // change here to your derived return } -void QExtent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *>("QT_PREPEND_NAMESPACE_QTMOF(QExtent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *"); - qRegisterMetaType<QExtent *>("QExtent *"); - qRegisterMetaType<const QSet<QExtent *> *>("const QSet<QExtent *> *"); - qRegisterMetaType<const QList<QExtent *> *>("const QList<QExtent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLink) *>("QT_PREPEND_NAMESPACE_QTMOF(QLink) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<QLink *>("QLink *"); - qRegisterMetaType<const QSet<QLink *> *>("const QSet<QLink *> *"); - qRegisterMetaType<const QList<QLink *> *>("const QList<QLink *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *>("QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<QReflectiveSequence *>("QReflectiveSequence *"); - qRegisterMetaType<const QSet<QReflectiveSequence *> *>("const QSet<QReflectiveSequence *> *"); - qRegisterMetaType<const QList<QReflectiveSequence *> *>("const QList<QReflectiveSequence *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qextent.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qextent.h b/src/mof/qextent.h index 6fc07b8f..22c9fd4a 100644 --- a/src/mof/qextent.h +++ b/src/mof/qextent.h @@ -78,11 +78,10 @@ public: // Operations Q_INVOKABLE bool useContainment() const; Q_INVOKABLE QReflectiveSequence *elements() const; - Q_INVOKABLE const QSet<QElement *> *elementsOfType(const QClass *type, bool includesSubtypes) const; - Q_INVOKABLE const QSet<QLink *> *linksOfType(const QAssociation *type) const; - Q_INVOKABLE const QSet<QElement *> *linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const; + Q_INVOKABLE const QSet<QElement *> &elementsOfType(const QClass *type, bool includesSubtypes) const; + Q_INVOKABLE const QSet<QLink *> &linksOfType(const QAssociation *type) const; + Q_INVOKABLE const QSet<QElement *> &linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const; Q_INVOKABLE bool linkExists(const QAssociation *association, const QElement *firstElement, const QElement *secondElement) const; - virtual void registerMetaTypes() const; protected: explicit QExtent(QExtentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QExtent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QExtent) *> *) - QT_END_HEADER #endif // QTMOF_QEXTENT_H diff --git a/src/mof/qfactory.cpp b/src/mof/qfactory.cpp index 52508339..9ace8713 100644 --- a/src/mof/qfactory.cpp +++ b/src/mof/qfactory.cpp @@ -124,7 +124,7 @@ QElement *QFactory::create(const QClass *metaClass) return 0; // change here to your derived return } -QElement *QFactory::createElement(const QClass *class_, const QSet<QArgument *> *arguments) +QElement *QFactory::createElement(const QClass *class_, const QSet<QArgument *> &arguments) { qWarning("QFactory::createElement: operation to be implemented"); Q_UNUSED(class_); @@ -143,70 +143,6 @@ QLink *QFactory::createLink(const QAssociation *association, const QElement *fir return 0; // change here to your derived return } -void QFactory::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *>("QT_PREPEND_NAMESPACE_QTMOF(QFactory) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *"); - qRegisterMetaType<QFactory *>("QFactory *"); - qRegisterMetaType<const QSet<QFactory *> *>("const QSet<QFactory *> *"); - qRegisterMetaType<const QList<QFactory *> *>("const QList<QFactory *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLink) *>("QT_PREPEND_NAMESPACE_QTMOF(QLink) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<QLink *>("QLink *"); - qRegisterMetaType<const QSet<QLink *> *>("const QSet<QLink *> *"); - qRegisterMetaType<const QList<QLink *> *>("const QList<QLink *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *>("QT_PREPEND_NAMESPACE_QTMOF(QArgument) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<QArgument *>("QArgument *"); - qRegisterMetaType<const QSet<QArgument *> *>("const QSet<QArgument *> *"); - qRegisterMetaType<const QList<QArgument *> *>("const QList<QArgument *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfactory.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qfactory.h b/src/mof/qfactory.h index e7ad0a48..796fe47b 100644 --- a/src/mof/qfactory.h +++ b/src/mof/qfactory.h @@ -88,9 +88,8 @@ public: Q_INVOKABLE QMofObject *createFromString(const QDataType *dataType, QString string); Q_INVOKABLE QString convertToString(const QDataType *dataType, const QMofObject *object); Q_INVOKABLE QElement *create(const QClass *metaClass); - Q_INVOKABLE QElement *createElement(const QClass *class_, const QSet<QArgument *> *arguments); + Q_INVOKABLE QElement *createElement(const QClass *class_, const QSet<QArgument *> &arguments); Q_INVOKABLE QLink *createLink(const QAssociation *association, const QElement *firstElement, const QElement *secondElement); - virtual void registerMetaTypes() const; protected: explicit QFactory(QFactoryPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QFactory) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QFactory) *> *) - QT_END_HEADER #endif // QTMOF_QFACTORY_H diff --git a/src/mof/qfeature.cpp b/src/mof/qfeature.cpp index 5f4123fe..527d36b8 100644 --- a/src/mof/qfeature.cpp +++ b/src/mof/qfeature.cpp @@ -49,22 +49,20 @@ QT_BEGIN_NAMESPACE_QTMOF QFeaturePrivate::QFeaturePrivate() : - isStatic(false), - featuringClassifiers(new QSet<QClassifier *>) + isStatic(false) { } QFeaturePrivate::~QFeaturePrivate() { - delete featuringClassifiers; } void QFeaturePrivate::addFeaturingClassifier(QClassifier *featuringClassifier) { // This is a read-only derived-union association end - if (!this->featuringClassifiers->contains(featuringClassifier)) { - this->featuringClassifiers->insert(featuringClassifier); + if (!this->featuringClassifiers.contains(featuringClassifier)) { + this->featuringClassifiers.insert(featuringClassifier); // Adjust opposite property Q_Q(QFeature); @@ -76,8 +74,8 @@ void QFeaturePrivate::removeFeaturingClassifier(QClassifier *featuringClassifier { // This is a read-only derived-union association end - if (this->featuringClassifiers->contains(featuringClassifier)) { - this->featuringClassifiers->remove(featuringClassifier); + if (this->featuringClassifiers.contains(featuringClassifier)) { + this->featuringClassifiers.remove(featuringClassifier); // Adjust opposite property Q_Q(QFeature); @@ -145,7 +143,7 @@ void QFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QFeature::featuringClassifiers() const +const QSet<QClassifier *> &QFeature::featuringClassifiers() const { // This is a read-only derived-union association end @@ -153,28 +151,6 @@ const QSet<QClassifier *> *QFeature::featuringClassifiers() const return d->featuringClassifiers; } -void QFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *"); - qRegisterMetaType<QFeature *>("QFeature *"); - qRegisterMetaType<const QSet<QFeature *> *>("const QSet<QFeature *> *"); - qRegisterMetaType<const QList<QFeature *> *>("const QList<QFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QRedefinableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qfeature.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qfeature.h b/src/mof/qfeature.h index b6a6aef4..402a8cdb 100644 --- a/src/mof/qfeature.h +++ b/src/mof/qfeature.h @@ -65,7 +65,7 @@ class Q_MOF_EXPORT QFeature : public QRedefinableElement Q_OBJECT Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(const QSet<QClassifier *> * featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) Q_DISABLE_COPY(QFeature) Q_DECLARE_PRIVATE(QFeature) @@ -80,8 +80,7 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Classes which access read-only opposite properties should be friend friend class QClassifierPrivate; @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QFeature) *> *) - QT_END_HEADER #endif // QTMOF_QFEATURE_H diff --git a/src/mof/qfeature_p.h b/src/mof/qfeature_p.h index 03d37965..05c448c5 100644 --- a/src/mof/qfeature_p.h +++ b/src/mof/qfeature_p.h @@ -67,7 +67,7 @@ public: virtual ~QFeaturePrivate(); bool isStatic; - QSet<QClassifier *> *featuringClassifiers; + QSet<QClassifier *> featuringClassifiers; // Internal functions for read-only subsetted association ends void addFeaturingClassifier(QClassifier *featuringClassifier); diff --git a/src/mof/qgeneralization.cpp b/src/mof/qgeneralization.cpp index eeee4323..de5bf522 100644 --- a/src/mof/qgeneralization.cpp +++ b/src/mof/qgeneralization.cpp @@ -180,28 +180,6 @@ void QGeneralization::setGeneral(QClassifier *general) } } -void QGeneralization::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *>("QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *"); - qRegisterMetaType<QGeneralization *>("QGeneralization *"); - qRegisterMetaType<const QSet<QGeneralization *> *>("const QSet<QGeneralization *> *"); - qRegisterMetaType<const QList<QGeneralization *> *>("const QList<QGeneralization *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qgeneralization.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qgeneralization.h b/src/mof/qgeneralization.h index 9cb22c93..a936c5d0 100644 --- a/src/mof/qgeneralization.h +++ b/src/mof/qgeneralization.h @@ -82,7 +82,6 @@ public: Q_INVOKABLE void setSpecific(QClassifier *specific); Q_INVOKABLE QClassifier *general() const; Q_INVOKABLE void setGeneral(QClassifier *general); - virtual void registerMetaTypes() const; protected: explicit QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -90,10 +89,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QGeneralization) *> *) - QT_END_HEADER #endif // QTMOF_QGENERALIZATION_H diff --git a/src/mof/qinstancespecification.cpp b/src/mof/qinstancespecification.cpp index fb49cf6a..54b567d9 100644 --- a/src/mof/qinstancespecification.cpp +++ b/src/mof/qinstancespecification.cpp @@ -49,16 +49,12 @@ QT_BEGIN_NAMESPACE_QTMOF QInstanceSpecificationPrivate::QInstanceSpecificationPrivate() : - classifiers(new QSet<QClassifier *>), - specification(0), - slots_(new QSet<QSlot *>) + specification(0) { } QInstanceSpecificationPrivate::~QInstanceSpecificationPrivate() { - delete classifiers; - delete slots_; } /*! @@ -90,7 +86,7 @@ QInstanceSpecification::~QInstanceSpecification() /*! The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them. */ -const QSet<QClassifier *> *QInstanceSpecification::classifiers() const +const QSet<QClassifier *> &QInstanceSpecification::classifiers() const { // This is a read-write association end @@ -103,8 +99,8 @@ void QInstanceSpecification::addClassifier(QClassifier *classifier) // This is a read-write association end Q_D(QInstanceSpecification); - if (!d->classifiers->contains(classifier)) { - d->classifiers->insert(classifier); + if (!d->classifiers.contains(classifier)) { + d->classifiers.insert(classifier); } } @@ -113,8 +109,8 @@ void QInstanceSpecification::removeClassifier(QClassifier *classifier) // This is a read-write association end Q_D(QInstanceSpecification); - if (d->classifiers->contains(classifier)) { - d->classifiers->remove(classifier); + if (d->classifiers.contains(classifier)) { + d->classifiers.remove(classifier); } } @@ -150,7 +146,7 @@ void QInstanceSpecification::setSpecification(QValueSpecification *specification /*! A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description. */ -const QSet<QSlot *> *QInstanceSpecification::slots_() const +const QSet<QSlot *> &QInstanceSpecification::slots_() const { // This is a read-write association end @@ -163,8 +159,8 @@ void QInstanceSpecification::addSlot_(QSlot *slot_) // This is a read-write association end Q_D(QInstanceSpecification); - if (!d->slots_->contains(slot_)) { - d->slots_->insert(slot_); + if (!d->slots_.contains(slot_)) { + d->slots_.insert(slot_); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(slot_)); @@ -179,8 +175,8 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) // This is a read-write association end Q_D(QInstanceSpecification); - if (d->slots_->contains(slot_)) { - d->slots_->remove(slot_); + if (d->slots_.contains(slot_)) { + d->slots_.remove(slot_); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(slot_)); @@ -190,42 +186,6 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) } } -void QInstanceSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *>("QT_PREPEND_NAMESPACE_QTMOF(QSlot) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<QSlot *>("QSlot *"); - qRegisterMetaType<const QSet<QSlot *> *>("const QSet<QSlot *> *"); - qRegisterMetaType<const QList<QSlot *> *>("const QList<QSlot *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinstancespecification.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancespecification.h b/src/mof/qinstancespecification.h index 1bb59263..c9205f15 100644 --- a/src/mof/qinstancespecification.h +++ b/src/mof/qinstancespecification.h @@ -66,9 +66,9 @@ class Q_MOF_EXPORT QInstanceSpecification : public QPackageableElement { Q_OBJECT - Q_PROPERTY(const QSet<QClassifier *> * classifiers READ classifiers) + Q_PROPERTY(QSet<QClassifier *> classifiers READ classifiers) Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(const QSet<QSlot *> * slots_ READ slots_) + Q_PROPERTY(QSet<QSlot *> slots_ READ slots_) Q_DISABLE_COPY(QInstanceSpecification) Q_DECLARE_PRIVATE(QInstanceSpecification) @@ -78,15 +78,14 @@ public: virtual ~QInstanceSpecification(); // Association ends from QInstanceSpecification - Q_INVOKABLE const QSet<QClassifier *> *classifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &classifiers() const; Q_INVOKABLE void addClassifier(QClassifier *classifier); Q_INVOKABLE void removeClassifier(QClassifier *classifier); Q_INVOKABLE QValueSpecification *specification() const; Q_INVOKABLE void setSpecification(QValueSpecification *specification); - Q_INVOKABLE const QSet<QSlot *> *slots_() const; + Q_INVOKABLE const QSet<QSlot *> &slots_() const; Q_INVOKABLE void addSlot_(QSlot *slot_); Q_INVOKABLE void removeSlot_(QSlot *slot_); - virtual void registerMetaTypes() const; protected: explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *) - QT_END_HEADER #endif // QTMOF_QINSTANCESPECIFICATION_H diff --git a/src/mof/qinstancespecification_p.h b/src/mof/qinstancespecification_p.h index a63f578f..4866d520 100644 --- a/src/mof/qinstancespecification_p.h +++ b/src/mof/qinstancespecification_p.h @@ -69,9 +69,9 @@ public: explicit QInstanceSpecificationPrivate(); virtual ~QInstanceSpecificationPrivate(); - QSet<QClassifier *> *classifiers; + QSet<QClassifier *> classifiers; QValueSpecification *specification; - QSet<QSlot *> *slots_; + QSet<QSlot *> slots_; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancevalue.cpp b/src/mof/qinstancevalue.cpp index 43853f49..e94267f3 100644 --- a/src/mof/qinstancevalue.cpp +++ b/src/mof/qinstancevalue.cpp @@ -102,28 +102,6 @@ void QInstanceValue::setInstance(QInstanceSpecification *instance) } } -void QInstanceValue::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *"); - qRegisterMetaType<QInstanceValue *>("QInstanceValue *"); - qRegisterMetaType<const QSet<QInstanceValue *> *>("const QSet<QInstanceValue *> *"); - qRegisterMetaType<const QList<QInstanceValue *> *>("const QList<QInstanceValue *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qinstancevalue.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qinstancevalue.h b/src/mof/qinstancevalue.h index c220cf80..2289283e 100644 --- a/src/mof/qinstancevalue.h +++ b/src/mof/qinstancevalue.h @@ -73,7 +73,6 @@ public: // Association ends from QInstanceValue Q_INVOKABLE QInstanceSpecification *instance() const; Q_INVOKABLE void setInstance(QInstanceSpecification *instance); - virtual void registerMetaTypes() const; protected: explicit QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceValue) *> *) - QT_END_HEADER #endif // QTMOF_QINSTANCEVALUE_H diff --git a/src/mof/qlink.cpp b/src/mof/qlink.cpp index 09f56dc9..4b848285 100644 --- a/src/mof/qlink.cpp +++ b/src/mof/qlink.cpp @@ -144,35 +144,6 @@ void QLink::delete_() qWarning("QLink::delete_: operation to be implemented"); } -void QLink::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLink) *>("QT_PREPEND_NAMESPACE_QTMOF(QLink) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *"); - qRegisterMetaType<QLink *>("QLink *"); - qRegisterMetaType<const QSet<QLink *> *>("const QSet<QLink *> *"); - qRegisterMetaType<const QList<QLink *> *>("const QList<QLink *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qlink.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qlink.h b/src/mof/qlink.h index 88aeda31..3781d2fa 100644 --- a/src/mof/qlink.h +++ b/src/mof/qlink.h @@ -84,7 +84,6 @@ public: // Operations Q_INVOKABLE bool equals(const QLink *otherLink) const; Q_INVOKABLE void delete_(); - virtual void registerMetaTypes() const; protected: explicit QLink(QLinkPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLink) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLink) *> *) - QT_END_HEADER #endif // QTMOF_QLINK_H diff --git a/src/mof/qliteralboolean.cpp b/src/mof/qliteralboolean.cpp index bc592eda..935b996a 100644 --- a/src/mof/qliteralboolean.cpp +++ b/src/mof/qliteralboolean.cpp @@ -125,21 +125,6 @@ bool QLiteralBoolean::isComputable() const return bool(); // change here to your derived return } -void QLiteralBoolean::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *"); - qRegisterMetaType<QLiteralBoolean *>("QLiteralBoolean *"); - qRegisterMetaType<const QSet<QLiteralBoolean *> *>("const QSet<QLiteralBoolean *> *"); - qRegisterMetaType<const QList<QLiteralBoolean *> *>("const QList<QLiteralBoolean *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralboolean.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralboolean.h b/src/mof/qliteralboolean.h index 7c3488b4..1165a5a5 100644 --- a/src/mof/qliteralboolean.h +++ b/src/mof/qliteralboolean.h @@ -75,7 +75,6 @@ public: // Operations Q_INVOKABLE bool booleanValue() const; Q_INVOKABLE bool isComputable() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralBoolean) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALBOOLEAN_H diff --git a/src/mof/qliteralinteger.cpp b/src/mof/qliteralinteger.cpp index 58679729..f2ffb352 100644 --- a/src/mof/qliteralinteger.cpp +++ b/src/mof/qliteralinteger.cpp @@ -119,21 +119,6 @@ bool QLiteralInteger::isComputable() const return bool(); // change here to your derived return } -void QLiteralInteger::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *"); - qRegisterMetaType<QLiteralInteger *>("QLiteralInteger *"); - qRegisterMetaType<const QSet<QLiteralInteger *> *>("const QSet<QLiteralInteger *> *"); - qRegisterMetaType<const QList<QLiteralInteger *> *>("const QList<QLiteralInteger *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralinteger.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralinteger.h b/src/mof/qliteralinteger.h index 24febb76..702eab2e 100644 --- a/src/mof/qliteralinteger.h +++ b/src/mof/qliteralinteger.h @@ -74,7 +74,6 @@ public: // Operations Q_INVOKABLE qint32 integerValue() const; Q_INVOKABLE bool isComputable() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralInteger) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALINTEGER_H diff --git a/src/mof/qliteralnull.cpp b/src/mof/qliteralnull.cpp index ca5512c1..9a87fb94 100644 --- a/src/mof/qliteralnull.cpp +++ b/src/mof/qliteralnull.cpp @@ -94,21 +94,6 @@ bool QLiteralNull::isNull() const return bool(); // change here to your derived return } -void QLiteralNull::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *"); - qRegisterMetaType<QLiteralNull *>("QLiteralNull *"); - qRegisterMetaType<const QSet<QLiteralNull *> *>("const QSet<QLiteralNull *> *"); - qRegisterMetaType<const QList<QLiteralNull *> *>("const QList<QLiteralNull *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralnull.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralnull.h b/src/mof/qliteralnull.h index befdb85d..8c9e2c84 100644 --- a/src/mof/qliteralnull.h +++ b/src/mof/qliteralnull.h @@ -68,7 +68,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE bool isNull() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -76,10 +75,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralNull) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALNULL_H diff --git a/src/mof/qliteralreal.cpp b/src/mof/qliteralreal.cpp index 8bf8a49d..3214abf8 100644 --- a/src/mof/qliteralreal.cpp +++ b/src/mof/qliteralreal.cpp @@ -116,21 +116,6 @@ qreal QLiteralReal::realValue() const return qreal(); // change here to your derived return } -void QLiteralReal::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *"); - qRegisterMetaType<QLiteralReal *>("QLiteralReal *"); - qRegisterMetaType<const QSet<QLiteralReal *> *>("const QSet<QLiteralReal *> *"); - qRegisterMetaType<const QList<QLiteralReal *> *>("const QList<QLiteralReal *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralreal.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralreal.h b/src/mof/qliteralreal.h index 14908778..35a70639 100644 --- a/src/mof/qliteralreal.h +++ b/src/mof/qliteralreal.h @@ -74,7 +74,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE qreal realValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralReal) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALREAL_H diff --git a/src/mof/qliteralspecification.cpp b/src/mof/qliteralspecification.cpp index 365ff023..98d5227f 100644 --- a/src/mof/qliteralspecification.cpp +++ b/src/mof/qliteralspecification.cpp @@ -74,21 +74,6 @@ QLiteralSpecification::~QLiteralSpecification() { } -void QLiteralSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *"); - qRegisterMetaType<QLiteralSpecification *>("QLiteralSpecification *"); - qRegisterMetaType<const QSet<QLiteralSpecification *> *>("const QSet<QLiteralSpecification *> *"); - qRegisterMetaType<const QList<QLiteralSpecification *> *>("const QList<QLiteralSpecification *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralspecification.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralspecification.h b/src/mof/qliteralspecification.h index 2c194da2..d54c7ebe 100644 --- a/src/mof/qliteralspecification.h +++ b/src/mof/qliteralspecification.h @@ -64,7 +64,6 @@ class Q_MOF_EXPORT QLiteralSpecification : public QValueSpecification public: Q_INVOKABLE explicit QLiteralSpecification(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QLiteralSpecification(); - virtual void registerMetaTypes() const; protected: explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralSpecification) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALSPECIFICATION_H diff --git a/src/mof/qliteralstring.cpp b/src/mof/qliteralstring.cpp index 31cc05ca..2813c0aa 100644 --- a/src/mof/qliteralstring.cpp +++ b/src/mof/qliteralstring.cpp @@ -119,21 +119,6 @@ QString QLiteralString::stringValue() const return QString(); // change here to your derived return } -void QLiteralString::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *"); - qRegisterMetaType<QLiteralString *>("QLiteralString *"); - qRegisterMetaType<const QSet<QLiteralString *> *>("const QSet<QLiteralString *> *"); - qRegisterMetaType<const QList<QLiteralString *> *>("const QList<QLiteralString *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralstring.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralstring.h b/src/mof/qliteralstring.h index 1b5419ee..e051625e 100644 --- a/src/mof/qliteralstring.h +++ b/src/mof/qliteralstring.h @@ -77,7 +77,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE QString stringValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -85,10 +84,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralString) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALSTRING_H diff --git a/src/mof/qliteralunlimitednatural.cpp b/src/mof/qliteralunlimitednatural.cpp index 736e8788..bbd99e19 100644 --- a/src/mof/qliteralunlimitednatural.cpp +++ b/src/mof/qliteralunlimitednatural.cpp @@ -125,21 +125,6 @@ qint32 QLiteralUnlimitedNatural::unlimitedValue() const return qint32(); // change here to your derived return } -void QLiteralUnlimitedNatural::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *>("QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *"); - qRegisterMetaType<QLiteralUnlimitedNatural *>("QLiteralUnlimitedNatural *"); - qRegisterMetaType<const QSet<QLiteralUnlimitedNatural *> *>("const QSet<QLiteralUnlimitedNatural *> *"); - qRegisterMetaType<const QList<QLiteralUnlimitedNatural *> *>("const QList<QLiteralUnlimitedNatural *> *"); - - QLiteralSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qliteralunlimitednatural.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qliteralunlimitednatural.h b/src/mof/qliteralunlimitednatural.h index cb09447a..ee42b5c0 100644 --- a/src/mof/qliteralunlimitednatural.h +++ b/src/mof/qliteralunlimitednatural.h @@ -75,7 +75,6 @@ public: // Operations Q_INVOKABLE bool isComputable() const; Q_INVOKABLE qint32 unlimitedValue() const; - virtual void registerMetaTypes() const; protected: explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QLiteralUnlimitedNatural) *> *) - QT_END_HEADER #endif // QTMOF_QLITERALUNLIMITEDNATURAL_H diff --git a/src/mof/qmofobject.cpp b/src/mof/qmofobject.cpp index bee08bdb..d6c06746 100644 --- a/src/mof/qmofobject.cpp +++ b/src/mof/qmofobject.cpp @@ -108,7 +108,7 @@ void QMofObject::unset(const QProperty *property) Q_UNUSED(property); } -QMofObject *QMofObject::invoke(const QOperation *op, const QSet<QArgument *> *arguments) +QMofObject *QMofObject::invoke(const QOperation *op, const QSet<QArgument *> &arguments) { qWarning("QMofObject::invoke: operation to be implemented"); Q_UNUSED(op); @@ -117,42 +117,6 @@ QMofObject *QMofObject::invoke(const QOperation *op, const QSet<QArgument *> *ar return 0; // change here to your derived return } -void QMofObject::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *>("QT_PREPEND_NAMESPACE_QTMOF(QArgument) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QArgument) *> *"); - qRegisterMetaType<QArgument *>("QArgument *"); - qRegisterMetaType<const QSet<QArgument *> *>("const QSet<QArgument *> *"); - qRegisterMetaType<const QList<QArgument *> *>("const QList<QArgument *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmofobject.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qmofobject.h b/src/mof/qmofobject.h index 95dcbb3e..026cb97f 100644 --- a/src/mof/qmofobject.h +++ b/src/mof/qmofobject.h @@ -80,8 +80,7 @@ public: Q_INVOKABLE void set(const QProperty *property, const QMofObject *value); Q_INVOKABLE bool isSet(const QProperty *property) const; Q_INVOKABLE void unset(const QProperty *property); - Q_INVOKABLE QMofObject *invoke(const QOperation *op, const QSet<QArgument *> *arguments); - virtual void registerMetaTypes() const; + Q_INVOKABLE QMofObject *invoke(const QOperation *op, const QSet<QArgument *> &arguments); protected: explicit QMofObject(QMofObjectPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -89,10 +88,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *) - QT_END_HEADER #endif // QTMOF_QMOFOBJECT_H diff --git a/src/mof/qmultiplicityelement.cpp b/src/mof/qmultiplicityelement.cpp index bf75038c..8695d62a 100644 --- a/src/mof/qmultiplicityelement.cpp +++ b/src/mof/qmultiplicityelement.cpp @@ -303,28 +303,6 @@ qint32 QMultiplicityElement::upperBound() const return qint32(); // change here to your derived return } -void QMultiplicityElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *"); - qRegisterMetaType<QMultiplicityElement *>("QMultiplicityElement *"); - qRegisterMetaType<const QSet<QMultiplicityElement *> *>("const QSet<QMultiplicityElement *> *"); - qRegisterMetaType<const QList<QMultiplicityElement *> *>("const QList<QMultiplicityElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qmultiplicityelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qmultiplicityelement.h b/src/mof/qmultiplicityelement.h index 74147c0a..abef6a85 100644 --- a/src/mof/qmultiplicityelement.h +++ b/src/mof/qmultiplicityelement.h @@ -100,7 +100,6 @@ public: Q_INVOKABLE bool isMultivalued() const; Q_INVOKABLE qint32 lowerBound() const; Q_INVOKABLE qint32 upperBound() const; - virtual void registerMetaTypes() const; protected: explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -108,10 +107,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QMultiplicityElement) *> *) - QT_END_HEADER #endif // QTMOF_QMULTIPLICITYELEMENT_H diff --git a/src/mof/qnamedelement.cpp b/src/mof/qnamedelement.cpp index 781a7f7d..2cf07a73 100644 --- a/src/mof/qnamedelement.cpp +++ b/src/mof/qnamedelement.cpp @@ -176,11 +176,11 @@ QNamespace *QNamedElement::namespace_() const /*! The query allNamespaces() gives the sequence of namespaces in which the NamedElement is nested, working outwards. */ -const QList<QNamespace *> *QNamedElement::allNamespaces() const +const QList<QNamespace *> &QNamedElement::allNamespaces() const { qWarning("QNamedElement::allNamespaces: operation to be implemented"); - return 0; // change here to your derived return + return *(new QList<QNamespace *>); // change here to your derived return } /*! @@ -205,28 +205,6 @@ QString QNamedElement::separator() const return QString(); // change here to your derived return } -void QNamedElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qnamedelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qnamedelement.h b/src/mof/qnamedelement.h index 9b815ecf..26d95d1a 100644 --- a/src/mof/qnamedelement.h +++ b/src/mof/qnamedelement.h @@ -91,10 +91,9 @@ public: Q_INVOKABLE QNamespace *namespace_() const; // Operations - Q_INVOKABLE const QList<QNamespace *> *allNamespaces() const; + Q_INVOKABLE const QList<QNamespace *> &allNamespaces() const; Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const; Q_INVOKABLE QString separator() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QNamespacePrivate; @@ -105,10 +104,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *) - QT_END_HEADER #endif // QTMOF_QNAMEDELEMENT_H diff --git a/src/mof/qnamespace.cpp b/src/mof/qnamespace.cpp index ecab6b1c..64d9ebeb 100644 --- a/src/mof/qnamespace.cpp +++ b/src/mof/qnamespace.cpp @@ -51,30 +51,20 @@ QT_BEGIN_NAMESPACE_QTMOF -QNamespacePrivate::QNamespacePrivate() : - packageImports(new QSet<QPackageImport *>), - members(new QSet<QNamedElement *>), - elementImports(new QSet<QElementImport *>), - ownedRules(new QSet<QConstraint *>), - ownedMembers(new QSet<QNamedElement *>) +QNamespacePrivate::QNamespacePrivate() { } QNamespacePrivate::~QNamespacePrivate() { - delete packageImports; - delete members; - delete elementImports; - delete ownedRules; - delete ownedMembers; } void QNamespacePrivate::addMember(QNamedElement *member) { // This is a read-only derived-union association end - if (!this->members->contains(member)) { - this->members->insert(member); + if (!this->members.contains(member)) { + this->members.insert(member); } } @@ -82,8 +72,8 @@ void QNamespacePrivate::removeMember(QNamedElement *member) { // This is a read-only derived-union association end - if (this->members->contains(member)) { - this->members->remove(member); + if (this->members.contains(member)) { + this->members.remove(member); } } @@ -91,8 +81,8 @@ void QNamespacePrivate::addOwnedMember(QNamedElement *ownedMember) { // This is a read-only derived-union association end - if (!this->ownedMembers->contains(ownedMember)) { - this->ownedMembers->insert(ownedMember); + if (!this->ownedMembers.contains(ownedMember)) { + this->ownedMembers.insert(ownedMember); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->addOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); @@ -108,8 +98,8 @@ void QNamespacePrivate::removeOwnedMember(QNamedElement *ownedMember) { // This is a read-only derived-union association end - if (this->ownedMembers->contains(ownedMember)) { - this->ownedMembers->remove(ownedMember); + if (this->ownedMembers.contains(ownedMember)) { + this->ownedMembers.remove(ownedMember); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(this))->removeOwnedElement(qwrappedobject_cast<QElement *>(ownedMember)); @@ -149,7 +139,7 @@ QNamespace::~QNamespace() /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QNamespace::packageImports() const +const QSet<QPackageImport *> &QNamespace::packageImports() const { // This is a read-write association end @@ -162,8 +152,8 @@ void QNamespace::addPackageImport(QPackageImport *packageImport) // This is a read-write association end Q_D(QNamespace); - if (!d->packageImports->contains(packageImport)) { - d->packageImports->insert(packageImport); + if (!d->packageImports.contains(packageImport)) { + d->packageImports.insert(packageImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); @@ -178,8 +168,8 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) // This is a read-write association end Q_D(QNamespace); - if (d->packageImports->contains(packageImport)) { - d->packageImports->remove(packageImport); + if (d->packageImports.contains(packageImport)) { + d->packageImports.remove(packageImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageImport)); @@ -192,7 +182,7 @@ void QNamespace::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QNamespace::members() const +const QSet<QNamedElement *> &QNamespace::members() const { // This is a read-only derived-union association end @@ -203,19 +193,19 @@ const QSet<QNamedElement *> *QNamespace::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QNamespace::importedMembers() const +const QSet<QPackageableElement *> &QNamespace::importedMembers() const { // This is a read-only derived association end qWarning("QNamespace::importedMembers: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QNamespace::elementImports() const +const QSet<QElementImport *> &QNamespace::elementImports() const { // This is a read-write association end @@ -228,8 +218,8 @@ void QNamespace::addElementImport(QElementImport *elementImport) // This is a read-write association end Q_D(QNamespace); - if (!d->elementImports->contains(elementImport)) { - d->elementImports->insert(elementImport); + if (!d->elementImports.contains(elementImport)) { + d->elementImports.insert(elementImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); @@ -244,8 +234,8 @@ void QNamespace::removeElementImport(QElementImport *elementImport) // This is a read-write association end Q_D(QNamespace); - if (d->elementImports->contains(elementImport)) { - d->elementImports->remove(elementImport); + if (d->elementImports.contains(elementImport)) { + d->elementImports.remove(elementImport); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(elementImport)); @@ -258,7 +248,7 @@ void QNamespace::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QNamespace::ownedRules() const +const QSet<QConstraint *> &QNamespace::ownedRules() const { // This is a read-write association end @@ -271,8 +261,8 @@ void QNamespace::addOwnedRule(QConstraint *ownedRule) // This is a read-write association end Q_D(QNamespace); - if (!d->ownedRules->contains(ownedRule)) { - d->ownedRules->insert(ownedRule); + if (!d->ownedRules.contains(ownedRule)) { + d->ownedRules.insert(ownedRule); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); @@ -287,8 +277,8 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) // This is a read-write association end Q_D(QNamespace); - if (d->ownedRules->contains(ownedRule)) { - d->ownedRules->remove(ownedRule); + if (d->ownedRules.contains(ownedRule)) { + d->ownedRules.remove(ownedRule); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(ownedRule)); @@ -301,7 +291,7 @@ void QNamespace::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QNamespace::ownedMembers() const +const QSet<QNamedElement *> &QNamespace::ownedMembers() const { // This is a read-only derived-union association end @@ -312,34 +302,34 @@ const QSet<QNamedElement *> *QNamespace::ownedMembers() const /*! The query excludeCollisions() excludes from a set of PackageableElements any that would not be distinguishable from each other in this namespace. */ -const QSet<QPackageableElement *> *QNamespace::excludeCollisions(const QPackageableElement *imps) const +const QSet<QPackageableElement *> &QNamespace::excludeCollisions(const QPackageableElement *imps) const { qWarning("QNamespace::excludeCollisions: operation to be implemented"); Q_UNUSED(imps); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! The query getNamesOfMember() gives a set of all of the names that a member would have in a Namespace. In general a member can have multiple names in a Namespace if it is imported more than once with different aliases. The query takes account of importing. It gives back the set of names that an element would have in an importing namespace, either because it is owned, or if not owned then imported individually, or if not individually then from a package. */ -const QSet<QString> *QNamespace::getNamesOfMember(const QNamedElement *element) const +const QSet<QString> QNamespace::getNamesOfMember(const QNamedElement *element) const { qWarning("QNamespace::getNamesOfMember: operation to be implemented"); Q_UNUSED(element); - return 0; // change here to your derived return + return QSet<QString>(); // change here to your derived return } /*! The query importMembers() defines which of a set of PackageableElements are actually imported into the namespace. This excludes hidden ones, i.e., those which have names that conflict with names of owned members, and also excludes elements which would have the same name when imported. */ -const QSet<QPackageableElement *> *QNamespace::importMembers(const QPackageableElement *imps) const +const QSet<QPackageableElement *> &QNamespace::importMembers(const QPackageableElement *imps) const { qWarning("QNamespace::importMembers: operation to be implemented"); Q_UNUSED(imps); - return 0; // change here to your derived return + return *(new QSet<QPackageableElement *>); // change here to your derived return } /*! @@ -352,49 +342,6 @@ bool QNamespace::membersAreDistinguishable() const return bool(); // change here to your derived return } -void QNamespace::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<QPackageImport *>("QPackageImport *"); - qRegisterMetaType<const QSet<QPackageImport *> *>("const QSet<QPackageImport *> *"); - qRegisterMetaType<const QList<QPackageImport *> *>("const QList<QPackageImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *>("QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElementImport) *> *"); - qRegisterMetaType<QElementImport *>("QElementImport *"); - qRegisterMetaType<const QSet<QElementImport *> *>("const QSet<QElementImport *> *"); - qRegisterMetaType<const QList<QElementImport *> *>("const QList<QElementImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qnamespace.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qnamespace.h b/src/mof/qnamespace.h index fb47db38..27f28fc1 100644 --- a/src/mof/qnamespace.h +++ b/src/mof/qnamespace.h @@ -68,12 +68,12 @@ class Q_MOF_EXPORT QNamespace : public QNamedElement { Q_OBJECT - Q_PROPERTY(const QSet<QPackageImport *> * packageImports READ packageImports) - Q_PROPERTY(const QSet<QNamedElement *> * members READ members) - Q_PROPERTY(const QSet<QPackageableElement *> * importedMembers READ importedMembers STORED false) - Q_PROPERTY(const QSet<QElementImport *> * elementImports READ elementImports) - Q_PROPERTY(const QSet<QConstraint *> * ownedRules READ ownedRules) - Q_PROPERTY(const QSet<QNamedElement *> * ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QNamedElement *> members READ members) + Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) Q_DISABLE_COPY(QNamespace) Q_DECLARE_PRIVATE(QNamespace) @@ -83,25 +83,24 @@ public: virtual ~QNamespace(); // Association ends from QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Operations - Q_INVOKABLE const QSet<QPackageableElement *> *excludeCollisions(const QPackageableElement *imps) const; - Q_INVOKABLE const QSet<QString> *getNamesOfMember(const QNamedElement *element) const; - Q_INVOKABLE const QSet<QPackageableElement *> *importMembers(const QPackageableElement *imps) const; + Q_INVOKABLE const QSet<QPackageableElement *> &excludeCollisions(const QPackageableElement *imps) const; + Q_INVOKABLE const QSet<QString> getNamesOfMember(const QNamedElement *element) const; + Q_INVOKABLE const QSet<QPackageableElement *> &importMembers(const QPackageableElement *imps) const; Q_INVOKABLE bool membersAreDistinguishable() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QNamedElementPrivate; @@ -112,10 +111,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *) - QT_END_HEADER #endif // QTMOF_QNAMESPACE_H diff --git a/src/mof/qnamespace_p.h b/src/mof/qnamespace_p.h index fca5fffa..b9266712 100644 --- a/src/mof/qnamespace_p.h +++ b/src/mof/qnamespace_p.h @@ -70,11 +70,11 @@ public: explicit QNamespacePrivate(); virtual ~QNamespacePrivate(); - QSet<QPackageImport *> *packageImports; - QSet<QNamedElement *> *members; - QSet<QElementImport *> *elementImports; - QSet<QConstraint *> *ownedRules; - QSet<QNamedElement *> *ownedMembers; + QSet<QPackageImport *> packageImports; + QSet<QNamedElement *> members; + QSet<QElementImport *> elementImports; + QSet<QConstraint *> ownedRules; + QSet<QNamedElement *> ownedMembers; // Internal functions for read-only subsetted association ends void addMember(QNamedElement *member); diff --git a/src/mof/qopaqueexpression.cpp b/src/mof/qopaqueexpression.cpp index c0f9664b..58aa0906 100644 --- a/src/mof/qopaqueexpression.cpp +++ b/src/mof/qopaqueexpression.cpp @@ -44,16 +44,12 @@ QT_BEGIN_NAMESPACE_QTMOF -QOpaqueExpressionPrivate::QOpaqueExpressionPrivate() : - bodies(new QList<QString>), - languages(new QList<QString>) +QOpaqueExpressionPrivate::QOpaqueExpressionPrivate() { } QOpaqueExpressionPrivate::~QOpaqueExpressionPrivate() { - delete bodies; - delete languages; } /*! @@ -85,7 +81,7 @@ QOpaqueExpression::~QOpaqueExpression() /*! The text of the expression, possibly in multiple languages. */ -const QList<QString> *QOpaqueExpression::bodies() const +const QList<QString> QOpaqueExpression::bodies() const { // This is a read-write attribute @@ -98,8 +94,8 @@ void QOpaqueExpression::addBody(QString body) // This is a read-write attribute Q_D(QOpaqueExpression); - if (!d->bodies->contains(body)) { - d->bodies->append(body); + if (!d->bodies.contains(body)) { + d->bodies.append(body); } } @@ -108,15 +104,15 @@ void QOpaqueExpression::removeBody(QString body) // This is a read-write attribute Q_D(QOpaqueExpression); - if (d->bodies->contains(body)) { - d->bodies->removeAll(body); + if (d->bodies.contains(body)) { + d->bodies.removeAll(body); } } /*! Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order. */ -const QList<QString> *QOpaqueExpression::languages() const +const QList<QString> QOpaqueExpression::languages() const { // This is a read-write attribute @@ -129,8 +125,8 @@ void QOpaqueExpression::addLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueExpression); - if (!d->languages->contains(language)) { - d->languages->append(language); + if (!d->languages.contains(language)) { + d->languages.append(language); } } @@ -139,8 +135,8 @@ void QOpaqueExpression::removeLanguage(QString language) // This is a read-write attribute Q_D(QOpaqueExpression); - if (d->languages->contains(language)) { - d->languages->removeAll(language); + if (d->languages.contains(language)) { + d->languages.removeAll(language); } } @@ -184,21 +180,6 @@ qint32 QOpaqueExpression::value() const return qint32(); // change here to your derived return } -void QOpaqueExpression::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *>("QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *"); - qRegisterMetaType<QOpaqueExpression *>("QOpaqueExpression *"); - qRegisterMetaType<const QSet<QOpaqueExpression *> *>("const QSet<QOpaqueExpression *> *"); - qRegisterMetaType<const QList<QOpaqueExpression *> *>("const QList<QOpaqueExpression *> *"); - - QValueSpecification::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qopaqueexpression.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qopaqueexpression.h b/src/mof/qopaqueexpression.h index e97fe8a7..21fe39d2 100644 --- a/src/mof/qopaqueexpression.h +++ b/src/mof/qopaqueexpression.h @@ -62,8 +62,8 @@ class Q_MOF_EXPORT QOpaqueExpression : public QValueSpecification { Q_OBJECT - Q_PROPERTY(const QList<QString> * bodies READ bodies) - Q_PROPERTY(const QList<QString> * languages READ languages) + Q_PROPERTY(QList<QString> bodies READ bodies) + Q_PROPERTY(QList<QString> languages READ languages) Q_DISABLE_COPY(QOpaqueExpression) Q_DECLARE_PRIVATE(QOpaqueExpression) @@ -73,10 +73,10 @@ public: virtual ~QOpaqueExpression(); // Attributes from QOpaqueExpression - Q_INVOKABLE const QList<QString> *bodies() const; + Q_INVOKABLE const QList<QString> bodies() const; Q_INVOKABLE void addBody(QString body); Q_INVOKABLE void removeBody(QString body); - Q_INVOKABLE const QList<QString> *languages() const; + Q_INVOKABLE const QList<QString> languages() const; Q_INVOKABLE void addLanguage(QString language); Q_INVOKABLE void removeLanguage(QString language); @@ -85,7 +85,6 @@ public: Q_INVOKABLE bool isNonNegative() const; Q_INVOKABLE bool isPositive() const; Q_INVOKABLE qint32 value() const; - virtual void registerMetaTypes() const; protected: explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QOpaqueExpression) *> *) - QT_END_HEADER #endif // QTMOF_QOPAQUEEXPRESSION_H diff --git a/src/mof/qopaqueexpression_p.h b/src/mof/qopaqueexpression_p.h index 283218cc..320be715 100644 --- a/src/mof/qopaqueexpression_p.h +++ b/src/mof/qopaqueexpression_p.h @@ -65,8 +65,8 @@ public: explicit QOpaqueExpressionPrivate(); virtual ~QOpaqueExpressionPrivate(); - QList<QString> *bodies; - QList<QString> *languages; + QList<QString> bodies; + QList<QString> languages; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qoperation.cpp b/src/mof/qoperation.cpp index 682488c2..b9135e17 100644 --- a/src/mof/qoperation.cpp +++ b/src/mof/qoperation.cpp @@ -53,24 +53,15 @@ QT_BEGIN_NAMESPACE_QTMOF QOperationPrivate::QOperationPrivate() : isQuery(false), - ownedParameters(new QList<QParameter *>), bodyCondition(0), - redefinedOperations(new QSet<QOperation *>), - postconditions(new QSet<QConstraint *>), datatype(0), - preconditions(new QSet<QConstraint *>), - class_(0), - raisedExceptions(new QSet<QType *>) + class_(0) { } QOperationPrivate::~QOperationPrivate() { - delete ownedParameters; - delete redefinedOperations; - delete postconditions; - delete preconditions; - delete raisedExceptions; + qDeleteAll(ownedParameters); } /*! @@ -180,7 +171,7 @@ bool QOperation::isOrdered() const /*! Specifies the parameters owned by this Operation. */ -const QList<QParameter *> *QOperation::ownedParameters() const +const QList<QParameter *> &QOperation::ownedParameters() const { // This is a read-write association end @@ -193,8 +184,8 @@ void QOperation::addOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QOperation); - if (!d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->append(ownedParameter); + if (!d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.append(ownedParameter); qTopLevelWrapper(ownedParameter)->setParent(qTopLevelWrapper(this)); // Adjust opposite property @@ -207,8 +198,8 @@ void QOperation::removeOwnedParameter(QParameter *ownedParameter) // This is a read-write association end Q_D(QOperation); - if (d->ownedParameters->contains(ownedParameter)) { - d->ownedParameters->removeAll(ownedParameter); + if (d->ownedParameters.contains(ownedParameter)) { + d->ownedParameters.removeAll(ownedParameter); qTopLevelWrapper(ownedParameter)->setParent(0); // Adjust opposite property @@ -248,7 +239,7 @@ void QOperation::setBodyCondition(QConstraint *bodyCondition) /*! References the Operations that are redefined by this Operation. */ -const QSet<QOperation *> *QOperation::redefinedOperations() const +const QSet<QOperation *> &QOperation::redefinedOperations() const { // This is a read-write association end @@ -261,8 +252,8 @@ void QOperation::addRedefinedOperation(QOperation *redefinedOperation) // This is a read-write association end Q_D(QOperation); - if (!d->redefinedOperations->contains(redefinedOperation)) { - d->redefinedOperations->insert(redefinedOperation); + if (!d->redefinedOperations.contains(redefinedOperation)) { + d->redefinedOperations.insert(redefinedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); @@ -274,8 +265,8 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) // This is a read-write association end Q_D(QOperation); - if (d->redefinedOperations->contains(redefinedOperation)) { - d->redefinedOperations->remove(redefinedOperation); + if (d->redefinedOperations.contains(redefinedOperation)) { + d->redefinedOperations.remove(redefinedOperation); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedOperation)); @@ -285,7 +276,7 @@ void QOperation::removeRedefinedOperation(QOperation *redefinedOperation) /*! An optional set of Constraints specifying the state of the system when the Operation is completed. */ -const QSet<QConstraint *> *QOperation::postconditions() const +const QSet<QConstraint *> &QOperation::postconditions() const { // This is a read-write association end @@ -298,8 +289,8 @@ void QOperation::addPostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QOperation); - if (!d->postconditions->contains(postcondition)) { - d->postconditions->insert(postcondition); + if (!d->postconditions.contains(postcondition)) { + d->postconditions.insert(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -311,8 +302,8 @@ void QOperation::removePostcondition(QConstraint *postcondition) // This is a read-write association end Q_D(QOperation); - if (d->postconditions->contains(postcondition)) { - d->postconditions->remove(postcondition); + if (d->postconditions.contains(postcondition)) { + d->postconditions.remove(postcondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(postcondition)); @@ -376,7 +367,7 @@ QType *QOperation::type() const /*! An optional set of Constraints on the state of the system when the Operation is invoked. */ -const QSet<QConstraint *> *QOperation::preconditions() const +const QSet<QConstraint *> &QOperation::preconditions() const { // This is a read-write association end @@ -389,8 +380,8 @@ void QOperation::addPrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QOperation); - if (!d->preconditions->contains(precondition)) { - d->preconditions->insert(precondition); + if (!d->preconditions.contains(precondition)) { + d->preconditions.insert(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->addOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -402,8 +393,8 @@ void QOperation::removePrecondition(QConstraint *precondition) // This is a read-write association end Q_D(QOperation); - if (d->preconditions->contains(precondition)) { - d->preconditions->remove(precondition); + if (d->preconditions.contains(precondition)) { + d->preconditions.remove(precondition); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespace *>(this))->removeOwnedRule(qwrappedobject_cast<QConstraint *>(precondition)); @@ -455,7 +446,7 @@ void QOperation::setClass_(QClass *class_) /*! References the Types representing exceptions that may be raised during an invocation of this operation. */ -const QSet<QType *> *QOperation::raisedExceptions() const +const QSet<QType *> &QOperation::raisedExceptions() const { // This is a read-write association end @@ -468,8 +459,8 @@ void QOperation::addRaisedException(QType *raisedException) // This is a read-write association end Q_D(QOperation); - if (!d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->insert(raisedException); + if (!d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.insert(raisedException); } } @@ -478,8 +469,8 @@ void QOperation::removeRaisedException(QType *raisedException) // This is a read-write association end Q_D(QOperation); - if (d->raisedExceptions->contains(raisedException)) { - d->raisedExceptions->remove(raisedException); + if (d->raisedExceptions.contains(raisedException)) { + d->raisedExceptions.remove(raisedException); } } @@ -497,68 +488,11 @@ bool QOperation::isConsistentWith(const QRedefinableElement *redefinee) const /*! The query returnResult() returns the set containing the return parameter of the Operation if one exists, otherwise, it returns an empty set */ -const QSet<QParameter *> *QOperation::returnResult() const +const QSet<QParameter *> &QOperation::returnResult() const { qWarning("QOperation::returnResult: operation to be implemented"); - return 0; // change here to your derived return -} - -void QOperation::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *>("QT_PREPEND_NAMESPACE_QTMOF(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *>("QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QConstraint) *> *"); - qRegisterMetaType<QConstraint *>("QConstraint *"); - qRegisterMetaType<const QSet<QConstraint *> *>("const QSet<QConstraint *> *"); - qRegisterMetaType<const QList<QConstraint *> *>("const QList<QConstraint *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - QBehavioralFeature::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QParameter *>); // change here to your derived return } #include "moc_qoperation.cpp" diff --git a/src/mof/qoperation.h b/src/mof/qoperation.h index 644cb35a..177f5c40 100644 --- a/src/mof/qoperation.h +++ b/src/mof/qoperation.h @@ -75,15 +75,15 @@ class Q_MOF_EXPORT QOperation : public QBehavioralFeature Q_PROPERTY(bool isUnique READ isUnique STORED false) Q_PROPERTY(qint32 upper READ upper STORED false) Q_PROPERTY(bool isOrdered READ isOrdered STORED false) - Q_PROPERTY(const QList<QParameter *> * ownedParameters READ ownedParameters) + Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) Q_PROPERTY(QConstraint * bodyCondition READ bodyCondition WRITE setBodyCondition) - Q_PROPERTY(const QSet<QOperation *> * redefinedOperations READ redefinedOperations) - Q_PROPERTY(const QSet<QConstraint *> * postconditions READ postconditions) + Q_PROPERTY(QSet<QOperation *> redefinedOperations READ redefinedOperations) + Q_PROPERTY(QSet<QConstraint *> postconditions READ postconditions) Q_PROPERTY(QDataType * datatype READ datatype WRITE setDatatype) Q_PROPERTY(QType * type READ type STORED false) - Q_PROPERTY(const QSet<QConstraint *> * preconditions READ preconditions) + Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) - Q_PROPERTY(const QSet<QType *> * raisedExceptions READ raisedExceptions) + Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) Q_DISABLE_COPY(QOperation) Q_DECLARE_PRIVATE(QOperation) @@ -102,33 +102,32 @@ public: Q_INVOKABLE bool isOrdered() const; // Association ends from QOperation - Q_INVOKABLE const QList<QParameter *> *ownedParameters() const; + Q_INVOKABLE const QList<QParameter *> &ownedParameters() const; Q_INVOKABLE void addOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE void removeOwnedParameter(QParameter *ownedParameter); Q_INVOKABLE QConstraint *bodyCondition() const; Q_INVOKABLE void setBodyCondition(QConstraint *bodyCondition); - Q_INVOKABLE const QSet<QOperation *> *redefinedOperations() const; + Q_INVOKABLE const QSet<QOperation *> &redefinedOperations() const; Q_INVOKABLE void addRedefinedOperation(QOperation *redefinedOperation); Q_INVOKABLE void removeRedefinedOperation(QOperation *redefinedOperation); - Q_INVOKABLE const QSet<QConstraint *> *postconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &postconditions() const; Q_INVOKABLE void addPostcondition(QConstraint *postcondition); Q_INVOKABLE void removePostcondition(QConstraint *postcondition); Q_INVOKABLE QDataType *datatype() const; Q_INVOKABLE void setDatatype(QDataType *datatype); Q_INVOKABLE QType *type() const; - Q_INVOKABLE const QSet<QConstraint *> *preconditions() const; + Q_INVOKABLE const QSet<QConstraint *> &preconditions() const; Q_INVOKABLE void addPrecondition(QConstraint *precondition); Q_INVOKABLE void removePrecondition(QConstraint *precondition); Q_INVOKABLE QClass *class_() const; Q_INVOKABLE void setClass_(QClass *class_); - Q_INVOKABLE const QSet<QType *> *raisedExceptions() const; + Q_INVOKABLE const QSet<QType *> &raisedExceptions() const; Q_INVOKABLE void addRaisedException(QType *raisedException); Q_INVOKABLE void removeRaisedException(QType *raisedException); // Operations Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; - Q_INVOKABLE const QSet<QParameter *> *returnResult() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QParameter *> &returnResult() const; protected: explicit QOperation(QOperationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -136,10 +135,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QOperation) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *) - QT_END_HEADER #endif // QTMOF_QOPERATION_H diff --git a/src/mof/qoperation_p.h b/src/mof/qoperation_p.h index e855674f..ebd3cafd 100644 --- a/src/mof/qoperation_p.h +++ b/src/mof/qoperation_p.h @@ -74,14 +74,14 @@ public: virtual ~QOperationPrivate(); bool isQuery; - QList<QParameter *> *ownedParameters; + QList<QParameter *> ownedParameters; QConstraint *bodyCondition; - QSet<QOperation *> *redefinedOperations; - QSet<QConstraint *> *postconditions; + QSet<QOperation *> redefinedOperations; + QSet<QConstraint *> postconditions; QDataType *datatype; - QSet<QConstraint *> *preconditions; + QSet<QConstraint *> preconditions; QClass *class_; - QSet<QType *> *raisedExceptions; + QSet<QType *> raisedExceptions; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackage.cpp b/src/mof/qpackage.cpp index d967ea17..108365de 100644 --- a/src/mof/qpackage.cpp +++ b/src/mof/qpackage.cpp @@ -49,16 +49,12 @@ QT_BEGIN_NAMESPACE_QTMOF QPackagePrivate::QPackagePrivate() : - packagedElements(new QSet<QPackageableElement *>), - nestingPackage(0), - packageMerges(new QSet<QPackageMerge *>) + nestingPackage(0) { } QPackagePrivate::~QPackagePrivate() { - delete packagedElements; - delete packageMerges; } /*! @@ -94,7 +90,7 @@ QPackage::~QPackage() /*! The Elements owned by this element. */ -const QSet<QElement *> *QPackage::ownedElements() const +const QSet<QElement *> &QPackage::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -110,7 +106,7 @@ QElement *QPackage::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QPackage::ownedComments() const +const QSet<QComment *> &QPackage::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -169,7 +165,7 @@ QNamespace *QPackage::namespace_() const /*! References the PackageImports owned by the Namespace. */ -const QSet<QPackageImport *> *QPackage::packageImports() const +const QSet<QPackageImport *> &QPackage::packageImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->packageImports(); } @@ -187,7 +183,7 @@ void QPackage::removePackageImport(QPackageImport *packageImport) /*! A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance. */ -const QSet<QNamedElement *> *QPackage::members() const +const QSet<QNamedElement *> &QPackage::members() const { return (qwrappedobject_cast<const QNamespace *>(this))->members(); } @@ -195,7 +191,7 @@ const QSet<QNamedElement *> *QPackage::members() const /*! References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports. */ -const QSet<QPackageableElement *> *QPackage::importedMembers() const +const QSet<QPackageableElement *> &QPackage::importedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->importedMembers(); } @@ -203,7 +199,7 @@ const QSet<QPackageableElement *> *QPackage::importedMembers() const /*! References the ElementImports owned by the Namespace. */ -const QSet<QElementImport *> *QPackage::elementImports() const +const QSet<QElementImport *> &QPackage::elementImports() const { return (qwrappedobject_cast<const QNamespace *>(this))->elementImports(); } @@ -221,7 +217,7 @@ void QPackage::removeElementImport(QElementImport *elementImport) /*! Specifies a set of Constraints owned by this Namespace. */ -const QSet<QConstraint *> *QPackage::ownedRules() const +const QSet<QConstraint *> &QPackage::ownedRules() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedRules(); } @@ -239,7 +235,7 @@ void QPackage::removeOwnedRule(QConstraint *ownedRule) /*! A collection of NamedElements owned by the Namespace. */ -const QSet<QNamedElement *> *QPackage::ownedMembers() const +const QSet<QNamedElement *> &QPackage::ownedMembers() const { return (qwrappedobject_cast<const QNamespace *>(this))->ownedMembers(); } @@ -298,13 +294,13 @@ void QPackage::setURI(QString URI) /*! References the packaged elements that are Types. */ -const QSet<QType *> *QPackage::ownedTypes() const +const QSet<QType *> &QPackage::ownedTypes() const { // This is a read-write derived association end qWarning("QPackage::ownedTypes: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QType *>); // change here to your derived return } void QPackage::addOwnedType(QType *ownedType) @@ -346,7 +342,7 @@ void QPackage::removeOwnedType(QType *ownedType) /*! Specifies the packageable elements that are owned by this Package. */ -const QSet<QPackageableElement *> *QPackage::packagedElements() const +const QSet<QPackageableElement *> &QPackage::packagedElements() const { // This is a read-write association end @@ -359,8 +355,8 @@ void QPackage::addPackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QPackage); - if (!d->packagedElements->contains(packagedElement)) { - d->packagedElements->insert(packagedElement); + if (!d->packagedElements.contains(packagedElement)) { + d->packagedElements.insert(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->addOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -372,8 +368,8 @@ void QPackage::removePackagedElement(QPackageableElement *packagedElement) // This is a read-write association end Q_D(QPackage); - if (d->packagedElements->contains(packagedElement)) { - d->packagedElements->remove(packagedElement); + if (d->packagedElements.contains(packagedElement)) { + d->packagedElements.remove(packagedElement); // Adjust subsetted property(ies) (qwrappedobject_cast<QNamespacePrivate *>(d))->removeOwnedMember(qwrappedobject_cast<QNamedElement *>(packagedElement)); @@ -415,7 +411,7 @@ void QPackage::setNestingPackage(QPackage *nestingPackage) /*! References the PackageMerges that are owned by this Package. */ -const QSet<QPackageMerge *> *QPackage::packageMerges() const +const QSet<QPackageMerge *> &QPackage::packageMerges() const { // This is a read-write association end @@ -428,8 +424,8 @@ void QPackage::addPackageMerge(QPackageMerge *packageMerge) // This is a read-write association end Q_D(QPackage); - if (!d->packageMerges->contains(packageMerge)) { - d->packageMerges->insert(packageMerge); + if (!d->packageMerges.contains(packageMerge)) { + d->packageMerges.insert(packageMerge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); @@ -444,8 +440,8 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) // This is a read-write association end Q_D(QPackage); - if (d->packageMerges->contains(packageMerge)) { - d->packageMerges->remove(packageMerge); + if (d->packageMerges.contains(packageMerge)) { + d->packageMerges.remove(packageMerge); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(packageMerge)); @@ -458,13 +454,13 @@ void QPackage::removePackageMerge(QPackageMerge *packageMerge) /*! References the packaged elements that are Packages. */ -const QSet<QPackage *> *QPackage::nestedPackages() const +const QSet<QPackage *> &QPackage::nestedPackages() const { // This is a read-write derived association end qWarning("QPackage::nestedPackages: to be implemented (this is a derived associationend)"); - return 0; // change here to your derived return + return *(new QSet<QPackage *>); // change here to your derived return } void QPackage::addNestedPackage(QPackage *nestedPackage) @@ -527,47 +523,11 @@ bool QPackage::mustBeOwned() const /*! The query visibleMembers() defines which members of a Package can be accessed outside it. */ -const QSet<QPackageableElement *> *QPackage::visibleMembers() const +const QSet<QPackageableElement *> &QPackage::visibleMembers() const { qWarning("QPackage::visibleMembers: operation to be implemented"); - return 0; // change here to your derived return -} - -void QPackage::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamedElement) *> *"); - qRegisterMetaType<QNamedElement *>("QNamedElement *"); - qRegisterMetaType<const QSet<QNamedElement *> *>("const QSet<QNamedElement *> *"); - qRegisterMetaType<const QList<QNamedElement *> *>("const QList<QNamedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<QPackageMerge *>("QPackageMerge *"); - qRegisterMetaType<const QSet<QPackageMerge *> *>("const QSet<QPackageMerge *> *"); - qRegisterMetaType<const QList<QPackageMerge *> *>("const QList<QPackageMerge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QPackageableElement *>); // change here to your derived return } // Overriden methods for subsetted properties diff --git a/src/mof/qpackage.h b/src/mof/qpackage.h index 2545bd02..de5c9ad7 100644 --- a/src/mof/qpackage.h +++ b/src/mof/qpackage.h @@ -74,11 +74,11 @@ class Q_MOF_EXPORT QPackage : public QWrappedObject Q_OBJECT Q_PROPERTY(QString URI READ URI WRITE setURI) - Q_PROPERTY(const QSet<QType *> * ownedTypes READ ownedTypes STORED false) - Q_PROPERTY(const QSet<QPackageableElement *> * packagedElements READ packagedElements) + Q_PROPERTY(QSet<QType *> ownedTypes READ ownedTypes STORED false) + Q_PROPERTY(QSet<QPackageableElement *> packagedElements READ packagedElements) Q_PROPERTY(QPackage * nestingPackage READ nestingPackage WRITE setNestingPackage) - Q_PROPERTY(const QSet<QPackageMerge *> * packageMerges READ packageMerges) - Q_PROPERTY(const QSet<QPackage *> * nestedPackages READ nestedPackages STORED false) + Q_PROPERTY(QSet<QPackageMerge *> packageMerges READ packageMerges) + Q_PROPERTY(QSet<QPackage *> nestedPackages READ nestedPackages STORED false) Q_DISABLE_COPY(QPackage) Q_DECLARE_PRIVATE(QPackage) @@ -88,9 +88,9 @@ public: virtual ~QPackage(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,18 +103,18 @@ public: Q_INVOKABLE QNamespace *namespace_() const; // Association ends from aggregated QNamespace - Q_INVOKABLE const QSet<QPackageImport *> *packageImports() const; + Q_INVOKABLE const QSet<QPackageImport *> &packageImports() const; Q_INVOKABLE void addPackageImport(QPackageImport *packageImport); Q_INVOKABLE void removePackageImport(QPackageImport *packageImport); - Q_INVOKABLE const QSet<QNamedElement *> *members() const; - Q_INVOKABLE const QSet<QPackageableElement *> *importedMembers() const; - Q_INVOKABLE const QSet<QElementImport *> *elementImports() const; + Q_INVOKABLE const QSet<QNamedElement *> &members() const; + Q_INVOKABLE const QSet<QPackageableElement *> &importedMembers() const; + Q_INVOKABLE const QSet<QElementImport *> &elementImports() const; Q_INVOKABLE void addElementImport(QElementImport *elementImport); Q_INVOKABLE void removeElementImport(QElementImport *elementImport); - Q_INVOKABLE const QSet<QConstraint *> *ownedRules() const; + Q_INVOKABLE const QSet<QConstraint *> &ownedRules() const; Q_INVOKABLE void addOwnedRule(QConstraint *ownedRule); Q_INVOKABLE void removeOwnedRule(QConstraint *ownedRule); - Q_INVOKABLE const QSet<QNamedElement *> *ownedMembers() const; + Q_INVOKABLE const QSet<QNamedElement *> &ownedMembers() const; // Attributes from aggregated QPackageableElement Q_INVOKABLE QtMof::VisibilityKind visibility() const; @@ -126,32 +126,31 @@ public: Q_INVOKABLE void setURI(QString URI); // Association ends from QPackage - Q_INVOKABLE const QSet<QType *> *ownedTypes() const; + Q_INVOKABLE const QSet<QType *> &ownedTypes() const; Q_INVOKABLE void addOwnedType(QType *ownedType); Q_INVOKABLE void removeOwnedType(QType *ownedType); - Q_INVOKABLE const QSet<QPackageableElement *> *packagedElements() const; + Q_INVOKABLE const QSet<QPackageableElement *> &packagedElements() const; Q_INVOKABLE void addPackagedElement(QPackageableElement *packagedElement); Q_INVOKABLE void removePackagedElement(QPackageableElement *packagedElement); Q_INVOKABLE QPackage *nestingPackage() const; Q_INVOKABLE void setNestingPackage(QPackage *nestingPackage); - Q_INVOKABLE const QSet<QPackageMerge *> *packageMerges() const; + Q_INVOKABLE const QSet<QPackageMerge *> &packageMerges() const; Q_INVOKABLE void addPackageMerge(QPackageMerge *packageMerge); Q_INVOKABLE void removePackageMerge(QPackageMerge *packageMerge); - Q_INVOKABLE const QSet<QPackage *> *nestedPackages() const; + Q_INVOKABLE const QSet<QPackage *> &nestedPackages() const; Q_INVOKABLE void addNestedPackage(QPackage *nestedPackage); Q_INVOKABLE void removeNestedPackage(QPackage *nestedPackage); // Operations Q_INVOKABLE bool makesVisible(const QNamedElement *el) const; Q_INVOKABLE bool mustBeOwned() const; - Q_INVOKABLE const QSet<QPackageableElement *> *visibleMembers() const; + Q_INVOKABLE const QSet<QPackageableElement *> &visibleMembers() const; // Overriden methods for subsetted properties Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QType> ownedType); Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QType> ownedType); Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage); - virtual void registerMetaTypes() const; protected: explicit QPackage(QPackagePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -163,10 +162,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackage) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGE_H diff --git a/src/mof/qpackage_p.h b/src/mof/qpackage_p.h index ee0f5ef6..225194a6 100644 --- a/src/mof/qpackage_p.h +++ b/src/mof/qpackage_p.h @@ -74,9 +74,9 @@ public: virtual ~QPackagePrivate(); QString URI; - QSet<QPackageableElement *> *packagedElements; + QSet<QPackageableElement *> packagedElements; QPackage *nestingPackage; - QSet<QPackageMerge *> *packageMerges; + QSet<QPackageMerge *> packageMerges; }; QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackageableelement.cpp b/src/mof/qpackageableelement.cpp index 6318d047..b51fc137 100644 --- a/src/mof/qpackageableelement.cpp +++ b/src/mof/qpackageableelement.cpp @@ -105,21 +105,6 @@ void QPackageableElement::unsetVisibility() setVisibility(QtMof::VisibilityPublic); } -void QPackageableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *"); - qRegisterMetaType<QPackageableElement *>("QPackageableElement *"); - qRegisterMetaType<const QSet<QPackageableElement *> *>("const QSet<QPackageableElement *> *"); - qRegisterMetaType<const QList<QPackageableElement *> *>("const QList<QPackageableElement *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackageableelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackageableelement.h b/src/mof/qpackageableelement.h index a6893ac0..01744ddf 100644 --- a/src/mof/qpackageableelement.h +++ b/src/mof/qpackageableelement.h @@ -74,7 +74,6 @@ public: Q_INVOKABLE QtMof::VisibilityKind visibility() const; Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); - virtual void registerMetaTypes() const; protected: explicit QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -82,10 +81,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageableElement) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGEABLEELEMENT_H diff --git a/src/mof/qpackageimport.cpp b/src/mof/qpackageimport.cpp index 7181dcba..2f8fc91e 100644 --- a/src/mof/qpackageimport.cpp +++ b/src/mof/qpackageimport.cpp @@ -181,35 +181,6 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage) } } -void QPackageImport::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *"); - qRegisterMetaType<QPackageImport *>("QPackageImport *"); - qRegisterMetaType<const QSet<QPackageImport *> *>("const QSet<QPackageImport *> *"); - qRegisterMetaType<const QList<QPackageImport *> *>("const QList<QPackageImport *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *>("QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QNamespace) *> *"); - qRegisterMetaType<QNamespace *>("QNamespace *"); - qRegisterMetaType<const QSet<QNamespace *> *>("const QSet<QNamespace *> *"); - qRegisterMetaType<const QList<QNamespace *> *>("const QList<QNamespace *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackageimport.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackageimport.h b/src/mof/qpackageimport.h index eacf34fd..528a1a5c 100644 --- a/src/mof/qpackageimport.h +++ b/src/mof/qpackageimport.h @@ -86,7 +86,6 @@ public: Q_INVOKABLE void setImportingNamespace(QNamespace *importingNamespace); Q_INVOKABLE QPackage *importedPackage() const; Q_INVOKABLE void setImportedPackage(QPackage *importedPackage); - virtual void registerMetaTypes() const; protected: explicit QPackageImport(QPackageImportPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -94,10 +93,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageImport) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGEIMPORT_H diff --git a/src/mof/qpackagemerge.cpp b/src/mof/qpackagemerge.cpp index 2ce87e6c..05a76a43 100644 --- a/src/mof/qpackagemerge.cpp +++ b/src/mof/qpackagemerge.cpp @@ -149,28 +149,6 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage) } } -void QPackageMerge::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *"); - qRegisterMetaType<QPackageMerge *>("QPackageMerge *"); - qRegisterMetaType<const QSet<QPackageMerge *> *>("const QSet<QPackageMerge *> *"); - qRegisterMetaType<const QList<QPackageMerge *> *>("const QList<QPackageMerge *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - QDirectedRelationship::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qpackagemerge.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qpackagemerge.h b/src/mof/qpackagemerge.h index 214a1538..5a82eaf9 100644 --- a/src/mof/qpackagemerge.h +++ b/src/mof/qpackagemerge.h @@ -76,7 +76,6 @@ public: Q_INVOKABLE void setMergedPackage(QPackage *mergedPackage); Q_INVOKABLE QPackage *receivingPackage() const; Q_INVOKABLE void setReceivingPackage(QPackage *receivingPackage); - virtual void registerMetaTypes() const; protected: explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -84,10 +83,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackageMerge) *> *) - QT_END_HEADER #endif // QTMOF_QPACKAGEMERGE_H diff --git a/src/mof/qparameter.cpp b/src/mof/qparameter.cpp index 8359acf0..ace4d73e 100644 --- a/src/mof/qparameter.cpp +++ b/src/mof/qparameter.cpp @@ -91,7 +91,7 @@ QParameter::~QParameter() /*! The Elements owned by this element. */ -const QSet<QElement *> *QParameter::ownedElements() const +const QSet<QElement *> &QParameter::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -107,7 +107,7 @@ QElement *QParameter::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QParameter::ownedComments() const +const QSet<QComment *> &QParameter::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -397,35 +397,6 @@ void QParameter::setDefaultValue(QValueSpecification *defaultValue) } } -void QParameter::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *>("QT_PREPEND_NAMESPACE_QTMOF(QParameter) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *"); - qRegisterMetaType<QParameter *>("QParameter *"); - qRegisterMetaType<const QSet<QParameter *> *>("const QSet<QParameter *> *"); - qRegisterMetaType<const QList<QParameter *> *>("const QList<QParameter *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *>("QT_PREPEND_NAMESPACE_QTMOF(QOperation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QOperation) *> *"); - qRegisterMetaType<QOperation *>("QOperation *"); - qRegisterMetaType<const QSet<QOperation *> *>("const QSet<QOperation *> *"); - qRegisterMetaType<const QList<QOperation *> *>("const QList<QOperation *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qparameter.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qparameter.h b/src/mof/qparameter.h index 78749e15..f93e97e7 100644 --- a/src/mof/qparameter.h +++ b/src/mof/qparameter.h @@ -84,9 +84,9 @@ public: virtual ~QParameter(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -134,7 +134,6 @@ public: Q_INVOKABLE void setOperation(QOperation *operation); Q_INVOKABLE QValueSpecification *defaultValue() const; Q_INVOKABLE void setDefaultValue(QValueSpecification *defaultValue); - virtual void registerMetaTypes() const; protected: explicit QParameter(QParameterPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -146,10 +145,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QParameter) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QParameter) *> *) - QT_END_HEADER #endif // QTMOF_QPARAMETER_H diff --git a/src/mof/qprimitivetype.cpp b/src/mof/qprimitivetype.cpp index ad6ff9de..e6e3c3d4 100644 --- a/src/mof/qprimitivetype.cpp +++ b/src/mof/qprimitivetype.cpp @@ -74,21 +74,6 @@ QPrimitiveType::~QPrimitiveType() { } -void QPrimitiveType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *>("QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *"); - qRegisterMetaType<QPrimitiveType *>("QPrimitiveType *"); - qRegisterMetaType<const QSet<QPrimitiveType *> *>("const QSet<QPrimitiveType *> *"); - qRegisterMetaType<const QList<QPrimitiveType *> *>("const QList<QPrimitiveType *> *"); - - QDataType::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qprimitivetype.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qprimitivetype.h b/src/mof/qprimitivetype.h index f9de07da..9779e887 100644 --- a/src/mof/qprimitivetype.h +++ b/src/mof/qprimitivetype.h @@ -64,7 +64,6 @@ class Q_MOF_EXPORT QPrimitiveType : public QDataType public: Q_INVOKABLE explicit QPrimitiveType(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); virtual ~QPrimitiveType(); - virtual void registerMetaTypes() const; protected: explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -72,10 +71,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QPrimitiveType) *> *) - QT_END_HEADER #endif // QTMOF_QPRIMITIVETYPE_H diff --git a/src/mof/qproperty.cpp b/src/mof/qproperty.cpp index 00ba419e..72a2181a 100644 --- a/src/mof/qproperty.cpp +++ b/src/mof/qproperty.cpp @@ -57,20 +57,16 @@ QPropertyPrivate::QPropertyPrivate() : isID(false), isDerivedUnion(false), aggregation(QtMof::AggregationNone), - subsettedProperties(new QSet<QProperty *>), owningAssociation(0), defaultValue(0), class_(0), datatype(0), - redefinedProperties(new QSet<QProperty *>), association(0) { } QPropertyPrivate::~QPropertyPrivate() { - delete subsettedProperties; - delete redefinedProperties; } /*! @@ -284,7 +280,7 @@ void QProperty::unsetAggregation() /*! References the properties of which this property is constrained to be a subset. */ -const QSet<QProperty *> *QProperty::subsettedProperties() const +const QSet<QProperty *> &QProperty::subsettedProperties() const { // This is a read-write association end @@ -297,8 +293,8 @@ void QProperty::addSubsettedProperty(QProperty *subsettedProperty) // This is a read-write association end Q_D(QProperty); - if (!d->subsettedProperties->contains(subsettedProperty)) { - d->subsettedProperties->insert(subsettedProperty); + if (!d->subsettedProperties.contains(subsettedProperty)) { + d->subsettedProperties.insert(subsettedProperty); } } @@ -307,8 +303,8 @@ void QProperty::removeSubsettedProperty(QProperty *subsettedProperty) // This is a read-write association end Q_D(QProperty); - if (d->subsettedProperties->contains(subsettedProperty)) { - d->subsettedProperties->remove(subsettedProperty); + if (d->subsettedProperties.contains(subsettedProperty)) { + d->subsettedProperties.remove(subsettedProperty); } } @@ -495,7 +491,7 @@ void QProperty::setDatatype(QDataType *datatype) /*! References the properties that are redefined by this property. */ -const QSet<QProperty *> *QProperty::redefinedProperties() const +const QSet<QProperty *> &QProperty::redefinedProperties() const { // This is a read-write association end @@ -508,8 +504,8 @@ void QProperty::addRedefinedProperty(QProperty *redefinedProperty) // This is a read-write association end Q_D(QProperty); - if (!d->redefinedProperties->contains(redefinedProperty)) { - d->redefinedProperties->insert(redefinedProperty); + if (!d->redefinedProperties.contains(redefinedProperty)) { + d->redefinedProperties.insert(redefinedProperty); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->addRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); @@ -521,8 +517,8 @@ void QProperty::removeRedefinedProperty(QProperty *redefinedProperty) // This is a read-write association end Q_D(QProperty); - if (d->redefinedProperties->contains(redefinedProperty)) { - d->redefinedProperties->remove(redefinedProperty); + if (d->redefinedProperties.contains(redefinedProperty)) { + d->redefinedProperties.remove(redefinedProperty); // Adjust subsetted property(ies) (qwrappedobject_cast<QRedefinableElementPrivate *>(d))->removeRedefinedElement(qwrappedobject_cast<QRedefinableElement *>(redefinedProperty)); @@ -593,68 +589,11 @@ bool QProperty::isNavigable() const /*! The query subsettingContext() gives the context for subsetting a property. It consists, in the case of an attribute, of the corresponding classifier, and in the case of an association end, all of the classifiers at the other ends. */ -const QSet<QType *> *QProperty::subsettingContext() const +const QSet<QType *> &QProperty::subsettingContext() const { qWarning("QProperty::subsettingContext: operation to be implemented"); - return 0; // change here to your derived return -} - -void QProperty::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *>("QT_PREPEND_NAMESPACE_QTMOF(QProperty) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *"); - qRegisterMetaType<QProperty *>("QProperty *"); - qRegisterMetaType<const QSet<QProperty *> *>("const QSet<QProperty *> *"); - qRegisterMetaType<const QList<QProperty *> *>("const QList<QProperty *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClass) *>("QT_PREPEND_NAMESPACE_QTMOF(QClass) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClass) *> *"); - qRegisterMetaType<QClass *>("QClass *"); - qRegisterMetaType<const QSet<QClass *> *>("const QSet<QClass *> *"); - qRegisterMetaType<const QList<QClass *> *>("const QList<QClass *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *>("QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QAssociation) *> *"); - qRegisterMetaType<QAssociation *>("QAssociation *"); - qRegisterMetaType<const QSet<QAssociation *> *>("const QSet<QAssociation *> *"); - qRegisterMetaType<const QList<QAssociation *> *>("const QList<QAssociation *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *>("QT_PREPEND_NAMESPACE_QTMOF(QDataType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QDataType) *> *"); - qRegisterMetaType<QDataType *>("QDataType *"); - qRegisterMetaType<const QSet<QDataType *> *>("const QSet<QDataType *> *"); - qRegisterMetaType<const QList<QDataType *> *>("const QList<QDataType *> *"); - - QStructuralFeature::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); + return *(new QSet<QType *>); // change here to your derived return } #include "moc_qproperty.cpp" diff --git a/src/mof/qproperty.h b/src/mof/qproperty.h index eafd6e8f..8646138d 100644 --- a/src/mof/qproperty.h +++ b/src/mof/qproperty.h @@ -80,13 +80,13 @@ class Q_MOF_EXPORT QProperty : public QStructuralFeature Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID) Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion) Q_PROPERTY(QtMof::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation) - Q_PROPERTY(const QSet<QProperty *> * subsettedProperties READ subsettedProperties) + Q_PROPERTY(QSet<QProperty *> subsettedProperties READ subsettedProperties) Q_PROPERTY(QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) Q_PROPERTY(QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) Q_PROPERTY(QProperty * opposite READ opposite WRITE setOpposite STORED false) Q_PROPERTY(QDataType * datatype READ datatype WRITE setDatatype) - Q_PROPERTY(const QSet<QProperty *> * redefinedProperties READ redefinedProperties) + Q_PROPERTY(QSet<QProperty *> redefinedProperties READ redefinedProperties) Q_PROPERTY(QAssociation * association READ association WRITE setAssociation) Q_DISABLE_COPY(QProperty) @@ -118,7 +118,7 @@ public: Q_INVOKABLE void unsetAggregation(); // Association ends from QProperty - Q_INVOKABLE const QSet<QProperty *> *subsettedProperties() const; + Q_INVOKABLE const QSet<QProperty *> &subsettedProperties() const; Q_INVOKABLE void addSubsettedProperty(QProperty *subsettedProperty); Q_INVOKABLE void removeSubsettedProperty(QProperty *subsettedProperty); Q_INVOKABLE QAssociation *owningAssociation() const; @@ -131,7 +131,7 @@ public: Q_INVOKABLE void setOpposite(QProperty *opposite); Q_INVOKABLE QDataType *datatype() const; Q_INVOKABLE void setDatatype(QDataType *datatype); - Q_INVOKABLE const QSet<QProperty *> *redefinedProperties() const; + Q_INVOKABLE const QSet<QProperty *> &redefinedProperties() const; Q_INVOKABLE void addRedefinedProperty(QProperty *redefinedProperty); Q_INVOKABLE void removeRedefinedProperty(QProperty *redefinedProperty); Q_INVOKABLE QAssociation *association() const; @@ -141,8 +141,7 @@ public: Q_INVOKABLE bool isAttribute(const QProperty *p) const; Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isNavigable() const; - Q_INVOKABLE const QSet<QType *> *subsettingContext() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QType *> &subsettingContext() const; protected: explicit QProperty(QPropertyPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -150,10 +149,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QProperty) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QProperty) *> *) - QT_END_HEADER #endif // QTMOF_QPROPERTY_H diff --git a/src/mof/qproperty_p.h b/src/mof/qproperty_p.h index 999bd3c1..f7332a8b 100644 --- a/src/mof/qproperty_p.h +++ b/src/mof/qproperty_p.h @@ -81,12 +81,12 @@ public: bool isID; bool isDerivedUnion; QtMof::AggregationKind aggregation; - QSet<QProperty *> *subsettedProperties; + QSet<QProperty *> subsettedProperties; QAssociation *owningAssociation; QValueSpecification *defaultValue; QClass *class_; QDataType *datatype; - QSet<QProperty *> *redefinedProperties; + QSet<QProperty *> redefinedProperties; QAssociation *association; }; diff --git a/src/mof/qredefinableelement.cpp b/src/mof/qredefinableelement.cpp index 554b19b6..3731f007 100644 --- a/src/mof/qredefinableelement.cpp +++ b/src/mof/qredefinableelement.cpp @@ -47,24 +47,20 @@ QT_BEGIN_NAMESPACE_QTMOF QRedefinableElementPrivate::QRedefinableElementPrivate() : - isLeaf(false), - redefinedElements(new QSet<QRedefinableElement *>), - redefinitionContexts(new QSet<QClassifier *>) + isLeaf(false) { } QRedefinableElementPrivate::~QRedefinableElementPrivate() { - delete redefinedElements; - delete redefinitionContexts; } void QRedefinableElementPrivate::addRedefinedElement(QRedefinableElement *redefinedElement) { // This is a read-only derived-union association end - if (!this->redefinedElements->contains(redefinedElement)) { - this->redefinedElements->insert(redefinedElement); + if (!this->redefinedElements.contains(redefinedElement)) { + this->redefinedElements.insert(redefinedElement); } } @@ -72,8 +68,8 @@ void QRedefinableElementPrivate::removeRedefinedElement(QRedefinableElement *red { // This is a read-only derived-union association end - if (this->redefinedElements->contains(redefinedElement)) { - this->redefinedElements->remove(redefinedElement); + if (this->redefinedElements.contains(redefinedElement)) { + this->redefinedElements.remove(redefinedElement); } } @@ -81,8 +77,8 @@ void QRedefinableElementPrivate::addRedefinitionContext(QClassifier *redefinitio { // This is a read-only derived-union association end - if (!this->redefinitionContexts->contains(redefinitionContext)) { - this->redefinitionContexts->insert(redefinitionContext); + if (!this->redefinitionContexts.contains(redefinitionContext)) { + this->redefinitionContexts.insert(redefinitionContext); } } @@ -90,8 +86,8 @@ void QRedefinableElementPrivate::removeRedefinitionContext(QClassifier *redefini { // This is a read-only derived-union association end - if (this->redefinitionContexts->contains(redefinitionContext)) { - this->redefinitionContexts->remove(redefinitionContext); + if (this->redefinitionContexts.contains(redefinitionContext)) { + this->redefinitionContexts.remove(redefinitionContext); } } @@ -154,7 +150,7 @@ void QRedefinableElement::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QRedefinableElement::redefinedElements() const +const QSet<QRedefinableElement *> &QRedefinableElement::redefinedElements() const { // This is a read-only derived-union association end @@ -165,7 +161,7 @@ const QSet<QRedefinableElement *> *QRedefinableElement::redefinedElements() cons /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QRedefinableElement::redefinitionContexts() const +const QSet<QClassifier *> &QRedefinableElement::redefinitionContexts() const { // This is a read-only derived-union association end @@ -195,28 +191,6 @@ bool QRedefinableElement::isRedefinitionContextValid(const QRedefinableElement * return bool(); // change here to your derived return } -void QRedefinableElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *"); - qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *"); - qRegisterMetaType<const QSet<QRedefinableElement *> *>("const QSet<QRedefinableElement *> *"); - qRegisterMetaType<const QList<QRedefinableElement *> *>("const QList<QRedefinableElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *>("QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QClassifier) *> *"); - qRegisterMetaType<QClassifier *>("QClassifier *"); - qRegisterMetaType<const QSet<QClassifier *> *>("const QSet<QClassifier *> *"); - qRegisterMetaType<const QList<QClassifier *> *>("const QList<QClassifier *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qredefinableelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qredefinableelement.h b/src/mof/qredefinableelement.h index e9a2af75..7ac9566e 100644 --- a/src/mof/qredefinableelement.h +++ b/src/mof/qredefinableelement.h @@ -65,8 +65,8 @@ class Q_MOF_EXPORT QRedefinableElement : public QNamedElement Q_OBJECT Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(const QSet<QRedefinableElement *> * redefinedElements READ redefinedElements) - Q_PROPERTY(const QSet<QClassifier *> * redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) Q_DISABLE_COPY(QRedefinableElement) Q_DECLARE_PRIVATE(QRedefinableElement) @@ -81,13 +81,12 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Operations Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const; Q_INVOKABLE bool isRedefinitionContextValid(const QRedefinableElement *redefined) const; - virtual void registerMetaTypes() const; protected: explicit QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -95,10 +94,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QRedefinableElement) *> *) - QT_END_HEADER #endif // QTMOF_QREDEFINABLEELEMENT_H diff --git a/src/mof/qredefinableelement_p.h b/src/mof/qredefinableelement_p.h index 2824ffce..47f90dc9 100644 --- a/src/mof/qredefinableelement_p.h +++ b/src/mof/qredefinableelement_p.h @@ -68,8 +68,8 @@ public: virtual ~QRedefinableElementPrivate(); bool isLeaf; - QSet<QRedefinableElement *> *redefinedElements; - QSet<QClassifier *> *redefinitionContexts; + QSet<QRedefinableElement *> redefinedElements; + QSet<QClassifier *> redefinitionContexts; // Internal functions for read-only subsetted association ends void addRedefinedElement(QRedefinableElement *redefinedElement); diff --git a/src/mof/qreflectivecollection.cpp b/src/mof/qreflectivecollection.cpp index 3b58718d..1852e064 100644 --- a/src/mof/qreflectivecollection.cpp +++ b/src/mof/qreflectivecollection.cpp @@ -103,21 +103,6 @@ qint32 QReflectiveCollection::size() const return qint32(); // change here to your derived return } -void QReflectiveCollection::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *>("QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *"); - qRegisterMetaType<QReflectiveCollection *>("QReflectiveCollection *"); - qRegisterMetaType<const QSet<QReflectiveCollection *> *>("const QSet<QReflectiveCollection *> *"); - qRegisterMetaType<const QList<QReflectiveCollection *> *>("const QList<QReflectiveCollection *> *"); - - QMofObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreflectivecollection.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qreflectivecollection.h b/src/mof/qreflectivecollection.h index 6a2ffe77..8347a33e 100644 --- a/src/mof/qreflectivecollection.h +++ b/src/mof/qreflectivecollection.h @@ -71,7 +71,6 @@ public: Q_INVOKABLE void clear(); Q_INVOKABLE bool remove(const QMofObject *object); Q_INVOKABLE qint32 size() const; - virtual void registerMetaTypes() const; protected: explicit QReflectiveCollection(QReflectiveCollectionPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -79,10 +78,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveCollection) *> *) - QT_END_HEADER #endif // QTMOF_QREFLECTIVECOLLECTION_H diff --git a/src/mof/qreflectivesequence.cpp b/src/mof/qreflectivesequence.cpp index 072b231e..b3c1ab00 100644 --- a/src/mof/qreflectivesequence.cpp +++ b/src/mof/qreflectivesequence.cpp @@ -101,28 +101,6 @@ QMofObject *QReflectiveSequence::set(qint32 index, const QMofObject *object) return 0; // change here to your derived return } -void QReflectiveSequence::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *>("QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *"); - qRegisterMetaType<QReflectiveSequence *>("QReflectiveSequence *"); - qRegisterMetaType<const QSet<QReflectiveSequence *> *>("const QSet<QReflectiveSequence *> *"); - qRegisterMetaType<const QList<QReflectiveSequence *> *>("const QList<QReflectiveSequence *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - QReflectiveCollection::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qreflectivesequence.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qreflectivesequence.h b/src/mof/qreflectivesequence.h index b3c7e7cf..aa6c728e 100644 --- a/src/mof/qreflectivesequence.h +++ b/src/mof/qreflectivesequence.h @@ -73,7 +73,6 @@ public: Q_INVOKABLE QMofObject *get(qint32 index) const; Q_INVOKABLE QMofObject *remove(qint32 index); Q_INVOKABLE QMofObject *set(qint32 index, const QMofObject *object); - virtual void registerMetaTypes() const; protected: explicit QReflectiveSequence(QReflectiveSequencePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QReflectiveSequence) *> *) - QT_END_HEADER #endif // QTMOF_QREFLECTIVESEQUENCE_H diff --git a/src/mof/qrelationship.cpp b/src/mof/qrelationship.cpp index 7c815636..bfa8a1ce 100644 --- a/src/mof/qrelationship.cpp +++ b/src/mof/qrelationship.cpp @@ -44,22 +44,20 @@ QT_BEGIN_NAMESPACE_QTMOF -QRelationshipPrivate::QRelationshipPrivate() : - relatedElements(new QSet<QElement *>) +QRelationshipPrivate::QRelationshipPrivate() { } QRelationshipPrivate::~QRelationshipPrivate() { - delete relatedElements; } void QRelationshipPrivate::addRelatedElement(QElement *relatedElement) { // This is a read-only derived-union association end - if (!this->relatedElements->contains(relatedElement)) { - this->relatedElements->insert(relatedElement); + if (!this->relatedElements.contains(relatedElement)) { + this->relatedElements.insert(relatedElement); } } @@ -67,8 +65,8 @@ void QRelationshipPrivate::removeRelatedElement(QElement *relatedElement) { // This is a read-only derived-union association end - if (this->relatedElements->contains(relatedElement)) { - this->relatedElements->remove(relatedElement); + if (this->relatedElements.contains(relatedElement)) { + this->relatedElements.remove(relatedElement); } } @@ -101,7 +99,7 @@ QRelationship::~QRelationship() /*! Specifies the elements related by the Relationship. */ -const QSet<QElement *> *QRelationship::relatedElements() const +const QSet<QElement *> &QRelationship::relatedElements() const { // This is a read-only derived-union association end @@ -109,21 +107,6 @@ const QSet<QElement *> *QRelationship::relatedElements() const return d->relatedElements; } -void QRelationship::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *>("QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *"); - qRegisterMetaType<QRelationship *>("QRelationship *"); - qRegisterMetaType<const QSet<QRelationship *> *>("const QSet<QRelationship *> *"); - qRegisterMetaType<const QList<QRelationship *> *>("const QList<QRelationship *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qrelationship.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qrelationship.h b/src/mof/qrelationship.h index 25736c40..fbb5ddf6 100644 --- a/src/mof/qrelationship.h +++ b/src/mof/qrelationship.h @@ -61,7 +61,7 @@ class Q_MOF_EXPORT QRelationship : public QElement { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * relatedElements READ relatedElements) + Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) Q_DISABLE_COPY(QRelationship) Q_DECLARE_PRIVATE(QRelationship) @@ -71,8 +71,7 @@ public: virtual ~QRelationship(); // Association ends from QRelationship - Q_INVOKABLE const QSet<QElement *> *relatedElements() const; - virtual void registerMetaTypes() const; + Q_INVOKABLE const QSet<QElement *> &relatedElements() const; protected: explicit QRelationship(QRelationshipPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -80,10 +79,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QRelationship) *> *) - QT_END_HEADER #endif // QTMOF_QRELATIONSHIP_H diff --git a/src/mof/qrelationship_p.h b/src/mof/qrelationship_p.h index d79be502..e4e79647 100644 --- a/src/mof/qrelationship_p.h +++ b/src/mof/qrelationship_p.h @@ -63,7 +63,7 @@ public: explicit QRelationshipPrivate(); virtual ~QRelationshipPrivate(); - QSet<QElement *> *relatedElements; + QSet<QElement *> relatedElements; // Internal functions for read-only subsetted association ends void addRelatedElement(QElement *relatedElement); diff --git a/src/mof/qslot.cpp b/src/mof/qslot.cpp index e89e37cb..c043347c 100644 --- a/src/mof/qslot.cpp +++ b/src/mof/qslot.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE_QTMOF QSlotPrivate::QSlotPrivate() : - values(new QList<QValueSpecification *>), definingFeature(0), owningInstance(0) { @@ -57,7 +56,6 @@ QSlotPrivate::QSlotPrivate() : QSlotPrivate::~QSlotPrivate() { - delete values; } /*! @@ -89,7 +87,7 @@ QSlot::~QSlot() /*! The value or values corresponding to the defining feature for the owning instance specification. */ -const QList<QValueSpecification *> *QSlot::values() const +const QList<QValueSpecification *> &QSlot::values() const { // This is a read-write association end @@ -102,8 +100,8 @@ void QSlot::addValue(QValueSpecification *value) // This is a read-write association end Q_D(QSlot); - if (!d->values->contains(value)) { - d->values->append(value); + if (!d->values.contains(value)) { + d->values.append(value); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->addOwnedElement(qwrappedobject_cast<QElement *>(value)); @@ -115,8 +113,8 @@ void QSlot::removeValue(QValueSpecification *value) // This is a read-write association end Q_D(QSlot); - if (d->values->contains(value)) { - d->values->removeAll(value); + if (d->values.contains(value)) { + d->values.removeAll(value); // Adjust subsetted property(ies) (qwrappedobject_cast<QElementPrivate *>(d))->removeOwnedElement(qwrappedobject_cast<QElement *>(value)); @@ -176,42 +174,6 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance) } } -void QSlot::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *>("QT_PREPEND_NAMESPACE_QTMOF(QSlot) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *"); - qRegisterMetaType<QSlot *>("QSlot *"); - qRegisterMetaType<const QSet<QSlot *> *>("const QSet<QSlot *> *"); - qRegisterMetaType<const QList<QSlot *> *>("const QList<QSlot *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *"); - qRegisterMetaType<const QSet<QStructuralFeature *> *>("const QSet<QStructuralFeature *> *"); - qRegisterMetaType<const QList<QStructuralFeature *> *>("const QList<QStructuralFeature *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QInstanceSpecification) *> *"); - qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *"); - qRegisterMetaType<const QSet<QInstanceSpecification *> *>("const QSet<QInstanceSpecification *> *"); - qRegisterMetaType<const QList<QInstanceSpecification *> *>("const QList<QInstanceSpecification *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qslot.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qslot.h b/src/mof/qslot.h index 0a689aef..5ebb8112 100644 --- a/src/mof/qslot.h +++ b/src/mof/qslot.h @@ -66,7 +66,7 @@ class Q_MOF_EXPORT QSlot : public QElement { Q_OBJECT - Q_PROPERTY(const QList<QValueSpecification *> * values READ values) + Q_PROPERTY(QList<QValueSpecification *> values READ values) Q_PROPERTY(QStructuralFeature * definingFeature READ definingFeature WRITE setDefiningFeature) Q_PROPERTY(QInstanceSpecification * owningInstance READ owningInstance WRITE setOwningInstance) @@ -78,14 +78,13 @@ public: virtual ~QSlot(); // Association ends from QSlot - Q_INVOKABLE const QList<QValueSpecification *> *values() const; + Q_INVOKABLE const QList<QValueSpecification *> &values() const; Q_INVOKABLE void addValue(QValueSpecification *value); Q_INVOKABLE void removeValue(QValueSpecification *value); Q_INVOKABLE QStructuralFeature *definingFeature() const; Q_INVOKABLE void setDefiningFeature(QStructuralFeature *definingFeature); Q_INVOKABLE QInstanceSpecification *owningInstance() const; Q_INVOKABLE void setOwningInstance(QInstanceSpecification *owningInstance); - virtual void registerMetaTypes() const; protected: explicit QSlot(QSlotPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -93,10 +92,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QSlot) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QSlot) *> *) - QT_END_HEADER #endif // QTMOF_QSLOT_H diff --git a/src/mof/qslot_p.h b/src/mof/qslot_p.h index 4fb0b82a..8324066e 100644 --- a/src/mof/qslot_p.h +++ b/src/mof/qslot_p.h @@ -69,7 +69,7 @@ public: explicit QSlotPrivate(); virtual ~QSlotPrivate(); - QList<QValueSpecification *> *values; + QList<QValueSpecification *> values; QStructuralFeature *definingFeature; QInstanceSpecification *owningInstance; }; diff --git a/src/mof/qstructuralfeature.cpp b/src/mof/qstructuralfeature.cpp index 8d40f1c1..f0d0e0f7 100644 --- a/src/mof/qstructuralfeature.cpp +++ b/src/mof/qstructuralfeature.cpp @@ -88,7 +88,7 @@ QStructuralFeature::~QStructuralFeature() /*! The Elements owned by this element. */ -const QSet<QElement *> *QStructuralFeature::ownedElements() const +const QSet<QElement *> &QStructuralFeature::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -104,7 +104,7 @@ QElement *QStructuralFeature::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QStructuralFeature::ownedComments() const +const QSet<QComment *> &QStructuralFeature::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -198,7 +198,7 @@ void QStructuralFeature::unsetLeaf() /*! The redefinable element that is being redefined by this element. */ -const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const +const QSet<QRedefinableElement *> &QStructuralFeature::redefinedElements() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinedElements(); } @@ -206,7 +206,7 @@ const QSet<QRedefinableElement *> *QStructuralFeature::redefinedElements() const /*! References the contexts that this element may be redefined from. */ -const QSet<QClassifier *> *QStructuralFeature::redefinitionContexts() const +const QSet<QClassifier *> &QStructuralFeature::redefinitionContexts() const { return (qwrappedobject_cast<const QRedefinableElement *>(this))->redefinitionContexts(); } @@ -240,7 +240,7 @@ void QStructuralFeature::unsetStatic() /*! The Classifiers that have this Feature as a feature. */ -const QSet<QClassifier *> *QStructuralFeature::featuringClassifiers() const +const QSet<QClassifier *> &QStructuralFeature::featuringClassifiers() const { return (qwrappedobject_cast<const QFeature *>(this))->featuringClassifiers(); } @@ -393,21 +393,6 @@ void QStructuralFeature::unsetReadOnly() setReadOnly(false); } -void QStructuralFeature::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *>("QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *"); - qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *"); - qRegisterMetaType<const QSet<QStructuralFeature *> *>("const QSet<QStructuralFeature *> *"); - qRegisterMetaType<const QList<QStructuralFeature *> *>("const QList<QStructuralFeature *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qstructuralfeature.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qstructuralfeature.h b/src/mof/qstructuralfeature.h index 5298b8e3..8549602e 100644 --- a/src/mof/qstructuralfeature.h +++ b/src/mof/qstructuralfeature.h @@ -72,9 +72,9 @@ public: virtual ~QStructuralFeature(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -94,8 +94,8 @@ public: Q_INVOKABLE void unsetLeaf(); // Association ends from aggregated QRedefinableElement - Q_INVOKABLE const QSet<QRedefinableElement *> *redefinedElements() const; - Q_INVOKABLE const QSet<QClassifier *> *redefinitionContexts() const; + Q_INVOKABLE const QSet<QRedefinableElement *> &redefinedElements() const; + Q_INVOKABLE const QSet<QClassifier *> &redefinitionContexts() const; // Attributes from aggregated QFeature Q_INVOKABLE bool isStatic() const; @@ -103,7 +103,7 @@ public: Q_INVOKABLE void unsetStatic(); // Association ends from aggregated QFeature - Q_INVOKABLE const QSet<QClassifier *> *featuringClassifiers() const; + Q_INVOKABLE const QSet<QClassifier *> &featuringClassifiers() const; // Association ends from aggregated QTypedElement Q_INVOKABLE QType *type() const; @@ -132,7 +132,6 @@ public: Q_INVOKABLE bool isReadOnly() const; Q_INVOKABLE void setReadOnly(bool isReadOnly); Q_INVOKABLE void unsetReadOnly(); - virtual void registerMetaTypes() const; protected: explicit QStructuralFeature(QStructuralFeaturePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -145,10 +144,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QStructuralFeature) *> *) - QT_END_HEADER #endif // QTMOF_QSTRUCTURALFEATURE_H diff --git a/src/mof/qtag.cpp b/src/mof/qtag.cpp index 202b323d..245185d5 100644 --- a/src/mof/qtag.cpp +++ b/src/mof/qtag.cpp @@ -45,14 +45,12 @@ QT_BEGIN_NAMESPACE_QTMOF QTagPrivate::QTagPrivate() : - elements(new QSet<QElement *>), tagOwner(0) { } QTagPrivate::~QTagPrivate() { - delete elements; } @@ -74,7 +72,7 @@ QTag::~QTag() // ATTRIBUTES FROM QTag // --------------------------------------------------------------- -const QSet<QElement *> *QTag::elements() const +const QSet<QElement *> &QTag::elements() const { // This is a read-write attribute @@ -87,8 +85,8 @@ void QTag::addElement(QElement *element) // This is a read-write attribute Q_D(QTag); - if (!d->elements->contains(element)) { - d->elements->insert(element); + if (!d->elements.contains(element)) { + d->elements.insert(element); } } @@ -97,8 +95,8 @@ void QTag::removeElement(QElement *element) // This is a read-write attribute Q_D(QTag); - if (d->elements->contains(element)) { - d->elements->remove(element); + if (d->elements.contains(element)) { + d->elements.remove(element); } } @@ -156,21 +154,6 @@ void QTag::setTagOwner(QElement *tagOwner) } } -void QTag::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QTag) *>("QT_PREPEND_NAMESPACE_QTMOF(QTag) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *"); - qRegisterMetaType<QTag *>("QTag *"); - qRegisterMetaType<const QSet<QTag *> *>("const QSet<QTag *> *"); - qRegisterMetaType<const QList<QTag *> *>("const QList<QTag *> *"); - - QElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtag.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtag.h b/src/mof/qtag.h index 3de11402..9258d7c4 100644 --- a/src/mof/qtag.h +++ b/src/mof/qtag.h @@ -62,7 +62,7 @@ class Q_MOF_EXPORT QTag : public QElement { Q_OBJECT - Q_PROPERTY(const QSet<QElement *> * elements READ elements) + Q_PROPERTY(QSet<QElement *> elements READ elements) Q_PROPERTY(QString value READ value WRITE setValue) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QElement * tagOwner READ tagOwner WRITE setTagOwner) @@ -75,7 +75,7 @@ public: virtual ~QTag(); // Attributes from QTag - Q_INVOKABLE const QSet<QElement *> *elements() const; + Q_INVOKABLE const QSet<QElement *> &elements() const; Q_INVOKABLE void addElement(QElement *element); Q_INVOKABLE void removeElement(QElement *element); Q_INVOKABLE QString value() const; @@ -84,7 +84,6 @@ public: Q_INVOKABLE void setName(QString name); Q_INVOKABLE QElement *tagOwner() const; Q_INVOKABLE void setTagOwner(QElement *tagOwner); - virtual void registerMetaTypes() const; protected: explicit QTag(QTagPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -92,10 +91,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QTag) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QTag) *> *) - QT_END_HEADER #endif // QTMOF_QTAG_H diff --git a/src/mof/qtag_p.h b/src/mof/qtag_p.h index d5bbb019..11251f8b 100644 --- a/src/mof/qtag_p.h +++ b/src/mof/qtag_p.h @@ -65,7 +65,7 @@ public: explicit QTagPrivate(); virtual ~QTagPrivate(); - QSet<QElement *> *elements; + QSet<QElement *> elements; QString value; QString name; QElement *tagOwner; diff --git a/src/mof/qtype.cpp b/src/mof/qtype.cpp index d827e6cc..77d8040c 100644 --- a/src/mof/qtype.cpp +++ b/src/mof/qtype.cpp @@ -133,35 +133,6 @@ bool QType::isInstance(const QMofObject *object) const return bool(); // change here to your derived return } -void QType::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *>("QT_PREPEND_NAMESPACE_QTMOF(QPackage) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QPackage) *> *"); - qRegisterMetaType<QPackage *>("QPackage *"); - qRegisterMetaType<const QSet<QPackage *> *>("const QSet<QPackage *> *"); - qRegisterMetaType<const QList<QPackage *> *>("const QList<QPackage *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *>("QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QMofObject) *> *"); - qRegisterMetaType<QMofObject *>("QMofObject *"); - qRegisterMetaType<const QSet<QMofObject *> *>("const QSet<QMofObject *> *"); - qRegisterMetaType<const QList<QMofObject *> *>("const QList<QMofObject *> *"); - - QPackageableElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtype.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtype.h b/src/mof/qtype.h index 981cfe16..82607ca6 100644 --- a/src/mof/qtype.h +++ b/src/mof/qtype.h @@ -78,7 +78,6 @@ public: // Operations Q_INVOKABLE bool conformsTo(const QType *other) const; Q_INVOKABLE bool isInstance(const QMofObject *object) const; - virtual void registerMetaTypes() const; protected: explicit QType(QTypePrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -86,10 +85,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QType) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *) - QT_END_HEADER #endif // QTMOF_QTYPE_H diff --git a/src/mof/qtypedelement.cpp b/src/mof/qtypedelement.cpp index 4573a200..b4f06a8c 100644 --- a/src/mof/qtypedelement.cpp +++ b/src/mof/qtypedelement.cpp @@ -102,28 +102,6 @@ void QTypedElement::setType(QType *type) } } -void QTypedElement::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *"); - qRegisterMetaType<QTypedElement *>("QTypedElement *"); - qRegisterMetaType<const QSet<QTypedElement *> *>("const QSet<QTypedElement *> *"); - qRegisterMetaType<const QList<QTypedElement *> *>("const QList<QTypedElement *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QType) *>("QT_PREPEND_NAMESPACE_QTMOF(QType) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QType) *> *"); - qRegisterMetaType<QType *>("QType *"); - qRegisterMetaType<const QSet<QType *> *>("const QSet<QType *> *"); - qRegisterMetaType<const QList<QType *> *>("const QList<QType *> *"); - - QNamedElement::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qtypedelement.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qtypedelement.h b/src/mof/qtypedelement.h index 4a5530fc..9091bad2 100644 --- a/src/mof/qtypedelement.h +++ b/src/mof/qtypedelement.h @@ -73,7 +73,6 @@ public: // Association ends from QTypedElement Q_INVOKABLE QType *type() const; Q_INVOKABLE void setType(QType *type); - virtual void registerMetaTypes() const; protected: explicit QTypedElement(QTypedElementPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -81,10 +80,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QTypedElement) *> *) - QT_END_HEADER #endif // QTMOF_QTYPEDELEMENT_H diff --git a/src/mof/quriextent.cpp b/src/mof/quriextent.cpp index 55cb60a6..768e9e8e 100644 --- a/src/mof/quriextent.cpp +++ b/src/mof/quriextent.cpp @@ -92,28 +92,6 @@ QElement *QURIExtent::element(QString uri) const return 0; // change here to your derived return } -void QURIExtent::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *>("QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *"); - qRegisterMetaType<QURIExtent *>("QURIExtent *"); - qRegisterMetaType<const QSet<QURIExtent *> *>("const QSet<QURIExtent *> *"); - qRegisterMetaType<const QList<QURIExtent *> *>("const QList<QURIExtent *> *"); - - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QElement) *>("QT_PREPEND_NAMESPACE_QTMOF(QElement) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QElement) *> *"); - qRegisterMetaType<QElement *>("QElement *"); - qRegisterMetaType<const QSet<QElement *> *>("const QSet<QElement *> *"); - qRegisterMetaType<const QList<QElement *> *>("const QList<QElement *> *"); - - QExtent::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_quriextent.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/quriextent.h b/src/mof/quriextent.h index db594093..9575c226 100644 --- a/src/mof/quriextent.h +++ b/src/mof/quriextent.h @@ -75,7 +75,6 @@ public: Q_INVOKABLE QString contextURI() const; Q_INVOKABLE QString uri(const QElement *object) const; Q_INVOKABLE QElement *element(QString uri) const; - virtual void registerMetaTypes() const; protected: explicit QURIExtent(QURIExtentPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -83,10 +82,6 @@ protected: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QURIExtent) *> *) - QT_END_HEADER #endif // QTMOF_QURIEXTENT_H diff --git a/src/mof/qvaluespecification.cpp b/src/mof/qvaluespecification.cpp index 74ccb96d..80cb582d 100644 --- a/src/mof/qvaluespecification.cpp +++ b/src/mof/qvaluespecification.cpp @@ -85,7 +85,7 @@ QValueSpecification::~QValueSpecification() /*! The Elements owned by this element. */ -const QSet<QElement *> *QValueSpecification::ownedElements() const +const QSet<QElement *> &QValueSpecification::ownedElements() const { return (qwrappedobject_cast<const QElement *>(this))->ownedElements(); } @@ -101,7 +101,7 @@ QElement *QValueSpecification::owner() const /*! The Comments owned by this element. */ -const QSet<QComment *> *QValueSpecification::ownedComments() const +const QSet<QComment *> &QValueSpecification::ownedComments() const { return (qwrappedobject_cast<const QElement *>(this))->ownedComments(); } @@ -262,21 +262,6 @@ qint32 QValueSpecification::unlimitedValue() const return qint32(); // change here to your derived return } -void QValueSpecification::registerMetaTypes() const -{ - qRegisterMetaType<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *>("QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *"); - qRegisterMetaType<const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *>("const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *"); - qRegisterMetaType<QValueSpecification *>("QValueSpecification *"); - qRegisterMetaType<const QSet<QValueSpecification *> *>("const QSet<QValueSpecification *> *"); - qRegisterMetaType<const QList<QValueSpecification *> *>("const QList<QValueSpecification *> *"); - - QWrappedObject::registerMetaTypes(); - - foreach (QWrappedObject *wrappedObject, wrappedObjects()) - wrappedObject->registerMetaTypes(); -} - #include "moc_qvaluespecification.cpp" QT_END_NAMESPACE_QTMOF diff --git a/src/mof/qvaluespecification.h b/src/mof/qvaluespecification.h index 8f89356d..a49c8c8d 100644 --- a/src/mof/qvaluespecification.h +++ b/src/mof/qvaluespecification.h @@ -72,9 +72,9 @@ public: virtual ~QValueSpecification(); // Association ends from aggregated QElement - Q_INVOKABLE const QSet<QElement *> *ownedElements() const; + Q_INVOKABLE const QSet<QElement *> &ownedElements() const; Q_INVOKABLE QElement *owner() const; - Q_INVOKABLE const QSet<QComment *> *ownedComments() const; + Q_INVOKABLE const QSet<QComment *> &ownedComments() const; Q_INVOKABLE void addOwnedComment(QComment *ownedComment); Q_INVOKABLE void removeOwnedComment(QComment *ownedComment); @@ -103,7 +103,6 @@ public: Q_INVOKABLE qreal realValue(); Q_INVOKABLE QString stringValue() const; Q_INVOKABLE qint32 unlimitedValue() const; - virtual void registerMetaTypes() const; protected: explicit QValueSpecification(QValueSpecificationPrivate &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0); @@ -115,10 +114,6 @@ private: QT_END_NAMESPACE_QTMOF -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTMOF(QValueSpecification) *> *) - QT_END_HEADER #endif // QTMOF_QVALUESPECIFICATION_H |