1 files changed, 17 insertions, 44 deletions
diff --git a/src/uml/qumllinkenddata.h b/src/uml/qumllinkenddata.h
index 4a40e2b0..03a10f4c 100644
--- a/src/uml/qumllinkenddata.h
+++ b/src/uml/qumllinkenddata.h
@@ -43,8 +43,8 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umllinkenddata_p.h"
+#include <QtUml/QUmlElement>
+
 
 QT_BEGIN_HEADER
 
@@ -52,61 +52,34 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtUml)
 
-class QUmlComment;
-class QUmlElement;
 class QUmlInputPin;
 class QUmlProperty;
 class QUmlQualifierValue;
 
-class Q_UML_EXPORT QUmlLinkEndData : public QObject, public UmlLinkEndData
+class Q_UML_EXPORT QUmlLinkEndData : public QUmlElement
 {
-    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 [LinkEndData]
-    Q_PROPERTY(QUmlProperty * end READ end)
-    Q_PROPERTY(QSet<QUmlQualifierValue *> qualifier READ qualifier)
-    Q_PROPERTY(QUmlInputPin * value READ value)
-
 public:
-    Q_INVOKABLE explicit QUmlLinkEndData(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;
+    explicit QUmlLinkEndData(bool createQObject = true);
+    virtual ~QUmlLinkEndData();
 
-    // Owned attributes [LinkEndData]
-    Q_INVOKABLE QUmlProperty *end() const;
-    Q_INVOKABLE const QSet<QUmlQualifierValue *> qualifier() const;
-    Q_INVOKABLE QUmlInputPin *value() const;
-
-    // Operations [Element]
-    Q_INVOKABLE QSet<QUmlElement *> allOwnedElements() const;
-    Q_INVOKABLE bool mustBeOwned() const;
-
-public Q_SLOTS:
-
-    // Slots for owned attributes [Element]
-    void addOwnedComment(UmlComment *ownedComment);
-    void removeOwnedComment(UmlComment *ownedComment);
-
-    // Slots for owned attributes [LinkEndData]
+    // Owned attributes
+    QUmlProperty *end() const;
     void setEnd(QUmlProperty *end);
-    void addQualifier(UmlQualifierValue *qualifier);
-    void removeQualifier(UmlQualifierValue *qualifier);
+    const QSet<QUmlQualifierValue *> qualifier() const;
+    void addQualifier(QUmlQualifierValue *qualifier);
+    void removeQualifier(QUmlQualifierValue *qualifier);
+    QUmlInputPin *value() const;
     void setValue(QUmlInputPin *value);
+
+protected:
+    QUmlProperty *_end;
+    QSet<QUmlQualifierValue *> _qualifier;
+    QUmlInputPin *_value;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlLinkEndData *)
-Q_DECLARE_METATYPE(QList<QUmlLinkEndData *> *)
-Q_DECLARE_METATYPE(QSet<QUmlLinkEndData *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlLinkEndData) *)
 
 QT_END_HEADER