1 files changed, 13 insertions, 93 deletions
diff --git a/src/uml/qumlinclude.h b/src/uml/qumlinclude.h
index c08918c4..fcdd813d 100644
--- a/src/uml/qumlinclude.h
+++ b/src/uml/qumlinclude.h
@@ -43,10 +43,9 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umlinclude_p.h"
+#include <QtUml/QUmlDirectedRelationship>
+#include <QtUml/QUmlNamedElement>
 
-#include <QtUml/QtUmlNamespace>
 
 QT_BEGIN_HEADER
 
@@ -54,107 +53,28 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtUml)
 
-class QUmlComment;
-class QUmlDependency;
-class QUmlElement;
-class QUmlNamedElement;
-class QUmlNamespace;
-class QUmlPackage;
-class QUmlStringExpression;
 class QUmlUseCase;
 
-class Q_UML_EXPORT QUmlInclude : public QObject, public UmlInclude
+class Q_UML_EXPORT QUmlInclude : public QUmlDirectedRelationship, public QUmlNamedElement
 {
-    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 [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 [Include]
-    Q_PROPERTY(QUmlUseCase * addition READ addition)
-    Q_PROPERTY(QUmlUseCase * includingCase READ includingCase)
-
 public:
-    Q_INVOKABLE explicit QUmlInclude(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;
-
-    // Owned attributes [DirectedRelationship]
-    Q_INVOKABLE const QSet<QUmlElement *> source() const;
-    Q_INVOKABLE const QSet<QUmlElement *> target() 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;
+    explicit QUmlInclude(bool createQObject = true);
+    virtual ~QUmlInclude();
 
-    // Owned attributes [Include]
-    Q_INVOKABLE QUmlUseCase *addition() const;
-    Q_INVOKABLE QUmlUseCase *includingCase() 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;
-
-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 [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 [Include]
+    // Owned attributes
+    QUmlUseCase *addition() const;
     void setAddition(QUmlUseCase *addition);
+    QUmlUseCase *includingCase() const;
     void setIncludingCase(QUmlUseCase *includingCase);
+
+protected:
+    QUmlUseCase *_addition;
+    QUmlUseCase *_includingCase;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlInclude *)
-Q_DECLARE_METATYPE(QList<QUmlInclude *> *)
-Q_DECLARE_METATYPE(QSet<QUmlInclude *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlInclude) *)
 
 QT_END_HEADER