diff options
Diffstat (limited to 'src/uml/qactivitygroup.h')
| -rw-r--r-- | src/uml/qactivitygroup.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/uml/qactivitygroup.h b/src/uml/qactivitygroup.h index e3eb465e..b51fdc6b 100644 --- a/src/uml/qactivitygroup.h +++ b/src/uml/qactivitygroup.h @@ -67,9 +67,9 @@ class Q_UML_EXPORT QActivityGroup : public QNamedElement Q_OBJECT Q_PROPERTY(QActivity * inActivity READ inActivity WRITE setInActivity) - Q_PROPERTY(const QSet<QActivityNode *> * containedNodes READ containedNodes) - Q_PROPERTY(const QSet<QActivityGroup *> * subgroups READ subgroups) - Q_PROPERTY(const QSet<QActivityEdge *> * containedEdges READ containedEdges) + Q_PROPERTY(QSet<QActivityNode *> containedNodes READ containedNodes) + Q_PROPERTY(QSet<QActivityGroup *> subgroups READ subgroups) + Q_PROPERTY(QSet<QActivityEdge *> containedEdges READ containedEdges) Q_PROPERTY(QActivityGroup * superGroup READ superGroup) Q_DISABLE_COPY(QActivityGroup) @@ -82,11 +82,10 @@ public: // Association ends from QActivityGroup Q_INVOKABLE QActivity *inActivity() const; Q_INVOKABLE void setInActivity(QActivity *inActivity); - Q_INVOKABLE const QSet<QActivityNode *> *containedNodes() const; - Q_INVOKABLE const QSet<QActivityGroup *> *subgroups() const; - Q_INVOKABLE const QSet<QActivityEdge *> *containedEdges() const; + Q_INVOKABLE const QSet<QActivityNode *> &containedNodes() const; + Q_INVOKABLE const QSet<QActivityGroup *> &subgroups() const; + Q_INVOKABLE const QSet<QActivityEdge *> &containedEdges() const; Q_INVOKABLE QActivityGroup *superGroup() const; - virtual void registerMetaTypes() const; // Classes which access read-only opposite properties should be friend friend class QActivityEdgePrivate; @@ -98,10 +97,6 @@ protected: QT_END_NAMESPACE_QTUML -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *) -Q_DECLARE_METATYPE(const QSet<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *) -Q_DECLARE_METATYPE(const QList<QT_PREPEND_NAMESPACE_QTUML(QActivityGroup) *> *) - QT_END_HEADER #endif // QTUML_QACTIVITYGROUP_H |