1 files changed, 19 insertions, 101 deletions
diff --git a/src/uml/qumlconnectionpointreference.h b/src/uml/qumlconnectionpointreference.h
index cd3a724e..2653530d 100644
--- a/src/uml/qumlconnectionpointreference.h
+++ b/src/uml/qumlconnectionpointreference.h
@@ -43,10 +43,8 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umlconnectionpointreference_p.h"
+#include <QtUml/QUmlVertex>
 
-#include <QtUml/QtUmlNamespace>
 
 QT_BEGIN_HEADER
 
@@ -54,114 +52,34 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtUml)
 
-class QUmlComment;
-class QUmlDependency;
-class QUmlElement;
-class QUmlNamedElement;
-class QUmlNamespace;
-class QUmlPackage;
 class QUmlPseudostate;
-class QUmlRegion;
 class QUmlState;
-class QUmlStateMachine;
-class QUmlStringExpression;
-class QUmlTransition;
 
-class Q_UML_EXPORT QUmlConnectionPointReference : public QObject, public UmlConnectionPointReference
+class Q_UML_EXPORT QUmlConnectionPointReference : public QUmlVertex
 {
-    Q_OBJECT
-
-    // Properties [Element]
-    Q_PROPERTY(QSet<QUmlComment *> ownedComment READ ownedComment)
-    Q_PROPERTY(QSet<QUmlElement *> ownedElement READ ownedElement)
-    Q_PROPERTY(QUmlElement * owner READ owner)
-
-    // Properties [NamedElement]
-    Q_PROPERTY(QSet<QUmlDependency *> clientDependency READ clientDependency)
-    Q_PROPERTY(QString name READ name)
-    Q_PROPERTY(QUmlStringExpression * nameExpression READ nameExpression)
-    Q_PROPERTY(QUmlNamespace * namespace_ READ namespace_)
-    Q_PROPERTY(QString qualifiedName READ qualifiedName)
-    Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility)
-
-    // Properties [Vertex]
-    Q_PROPERTY(QUmlRegion * container READ container)
-    Q_PROPERTY(QSet<QUmlTransition *> incoming READ incoming)
-    Q_PROPERTY(QSet<QUmlTransition *> outgoing READ outgoing)
-
-    // Properties [ConnectionPointReference]
-    Q_PROPERTY(QSet<QUmlPseudostate *> entry READ entry)
-    Q_PROPERTY(QSet<QUmlPseudostate *> exit READ exit)
-    Q_PROPERTY(QUmlState * state READ state)
-
 public:
-    Q_INVOKABLE explicit QUmlConnectionPointReference(QObject *parent = 0);
-
-    // Owned attributes [Element]
-    Q_INVOKABLE const QSet<QUmlComment *> ownedComment() const;
-    Q_INVOKABLE const QSet<QUmlElement *> ownedElement() const;
-    Q_INVOKABLE QUmlElement *owner() const;
-
-    // Owned attributes [NamedElement]
-    Q_INVOKABLE const QSet<QUmlDependency *> clientDependency() const;
-    Q_INVOKABLE QString name() const;
-    Q_INVOKABLE QUmlStringExpression *nameExpression() const;
-    Q_INVOKABLE QUmlNamespace *namespace_() const;
-    Q_INVOKABLE QString qualifiedName() const;
-    Q_INVOKABLE QtUml::VisibilityKind visibility() const;
-
-    // Owned attributes [Vertex]
-    Q_INVOKABLE QUmlRegion *container() const;
-    Q_INVOKABLE const QSet<QUmlTransition *> incoming() const;
-    Q_INVOKABLE const QSet<QUmlTransition *> outgoing() const;
-
-    // Owned attributes [ConnectionPointReference]
-    Q_INVOKABLE const QSet<QUmlPseudostate *> entry() const;
-    Q_INVOKABLE const QSet<QUmlPseudostate *> exit() const;
-    Q_INVOKABLE QUmlState *state() const;
-
-    // Operations [Element]
-    Q_INVOKABLE QSet<QUmlElement *> allOwnedElements() const;
-    Q_INVOKABLE bool mustBeOwned() const;
-
-    // Operations [NamedElement]
-    Q_INVOKABLE QList<QUmlNamespace *> allNamespaces() const;
-    Q_INVOKABLE QSet<QUmlPackage *> allOwningPackages() const;
-    Q_INVOKABLE bool isDistinguishableFrom(QUmlNamedElement *n, QUmlNamespace *ns) const;
-    Q_INVOKABLE QString separator() const;
-
-    // Operations [Vertex]
-    Q_INVOKABLE QUmlStateMachine *containingStateMachine() const;
-
-public Q_SLOTS:
-
-    // Slots for owned attributes [Element]
-    void addOwnedComment(UmlComment *ownedComment);
-    void removeOwnedComment(UmlComment *ownedComment);
-
-    // Slots for owned attributes [NamedElement]
-    void addClientDependency(UmlDependency *clientDependency);
-    void removeClientDependency(UmlDependency *clientDependency);
-    void setName(QString name);
-    void setNameExpression(QUmlStringExpression *nameExpression);
-    void setVisibility(QtUml::VisibilityKind visibility);
-
-    // Slots for owned attributes [Vertex]
-    void setContainer(QUmlRegion *container);
-
-    // Slots for owned attributes [ConnectionPointReference]
-    void addEntry(UmlPseudostate *entry);
-    void removeEntry(UmlPseudostate *entry);
-    void addExit(UmlPseudostate *exit);
-    void removeExit(UmlPseudostate *exit);
+    explicit QUmlConnectionPointReference(bool createQObject = true);
+    virtual ~QUmlConnectionPointReference();
+
+    // Owned attributes
+    const QSet<QUmlPseudostate *> entry() const;
+    void addEntry(QUmlPseudostate *entry);
+    void removeEntry(QUmlPseudostate *entry);
+    const QSet<QUmlPseudostate *> exit() const;
+    void addExit(QUmlPseudostate *exit);
+    void removeExit(QUmlPseudostate *exit);
+    QUmlState *state() const;
     void setState(QUmlState *state);
+
+protected:
+    QSet<QUmlPseudostate *> _entry;
+    QSet<QUmlPseudostate *> _exit;
+    QUmlState *_state;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlConnectionPointReference *)
-Q_DECLARE_METATYPE(QList<QUmlConnectionPointReference *> *)
-Q_DECLARE_METATYPE(QSet<QUmlConnectionPointReference *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlConnectionPointReference) *)
 
 QT_END_HEADER