1 files changed, 17 insertions, 62 deletions
diff --git a/src/uml/qumltemplatebinding.h b/src/uml/qumltemplatebinding.h
index f9c2195f..c13b719f 100644
--- a/src/uml/qumltemplatebinding.h
+++ b/src/uml/qumltemplatebinding.h
@@ -43,8 +43,8 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umltemplatebinding_p.h"
+#include <QtUml/QUmlDirectedRelationship>
+
 
 QT_BEGIN_HEADER
 
@@ -52,79 +52,34 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtUml)
 
-class QUmlComment;
-class QUmlElement;
 class QUmlTemplateableElement;
 class QUmlTemplateParameterSubstitution;
 class QUmlTemplateSignature;
 
-class Q_UML_EXPORT QUmlTemplateBinding : public QObject, public UmlTemplateBinding
+class Q_UML_EXPORT QUmlTemplateBinding : public QUmlDirectedRelationship
 {
-    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 [Relationship]
-    Q_PROPERTY(QSet<QUmlElement *> relatedElement READ relatedElement)
-
-    // Properties [DirectedRelationship]
-    Q_PROPERTY(QSet<QUmlElement *> source READ source)
-    Q_PROPERTY(QSet<QUmlElement *> target READ target)
-
-    // Properties [TemplateBinding]
-    Q_PROPERTY(QUmlTemplateableElement * boundElement READ boundElement)
-    Q_PROPERTY(QSet<QUmlTemplateParameterSubstitution *> parameterSubstitution READ parameterSubstitution)
-    Q_PROPERTY(QUmlTemplateSignature * signature READ signature)
-
 public:
-    Q_INVOKABLE explicit QUmlTemplateBinding(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 [Relationship]
-    Q_INVOKABLE const QSet<QUmlElement *> relatedElement() const;
+    explicit QUmlTemplateBinding(bool createQObject = true);
+    virtual ~QUmlTemplateBinding();
 
-    // Owned attributes [DirectedRelationship]
-    Q_INVOKABLE const QSet<QUmlElement *> source() const;
-    Q_INVOKABLE const QSet<QUmlElement *> target() const;
-
-    // Owned attributes [TemplateBinding]
-    Q_INVOKABLE QUmlTemplateableElement *boundElement() const;
-    Q_INVOKABLE const QSet<QUmlTemplateParameterSubstitution *> parameterSubstitution() const;
-    Q_INVOKABLE QUmlTemplateSignature *signature() 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 [Relationship]
-
-    // Slots for owned attributes [DirectedRelationship]
-
-    // Slots for owned attributes [TemplateBinding]
+    // Owned attributes
+    QUmlTemplateableElement *boundElement() const;
     void setBoundElement(QUmlTemplateableElement *boundElement);
-    void addParameterSubstitution(UmlTemplateParameterSubstitution *parameterSubstitution);
-    void removeParameterSubstitution(UmlTemplateParameterSubstitution *parameterSubstitution);
+    const QSet<QUmlTemplateParameterSubstitution *> parameterSubstitution() const;
+    void addParameterSubstitution(QUmlTemplateParameterSubstitution *parameterSubstitution);
+    void removeParameterSubstitution(QUmlTemplateParameterSubstitution *parameterSubstitution);
+    QUmlTemplateSignature *signature() const;
     void setSignature(QUmlTemplateSignature *signature);
+
+protected:
+    QUmlTemplateableElement *_boundElement;
+    QSet<QUmlTemplateParameterSubstitution *> _parameterSubstitution;
+    QUmlTemplateSignature *_signature;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlTemplateBinding *)
-Q_DECLARE_METATYPE(QList<QUmlTemplateBinding *> *)
-Q_DECLARE_METATYPE(QSet<QUmlTemplateBinding *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlTemplateBinding) *)
 
 QT_END_HEADER