1 files changed, 15 insertions, 60 deletions
diff --git a/src/uml/qumlprofileapplication.h b/src/uml/qumlprofileapplication.h
index bad3c2be..a9830308 100644
--- a/src/uml/qumlprofileapplication.h
+++ b/src/uml/qumlprofileapplication.h
@@ -43,8 +43,8 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umlprofileapplication_p.h"
+#include <QtUml/QUmlDirectedRelationship>
+
 
 QT_BEGIN_HEADER
 
@@ -52,77 +52,32 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtUml)
 
-class QUmlComment;
-class QUmlElement;
 class QUmlPackage;
 class QUmlProfile;
 
-class Q_UML_EXPORT QUmlProfileApplication : public QObject, public UmlProfileApplication
+class Q_UML_EXPORT QUmlProfileApplication : 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 [ProfileApplication]
-    Q_PROPERTY(QUmlProfile * appliedProfile READ appliedProfile)
-    Q_PROPERTY(QUmlPackage * applyingPackage READ applyingPackage)
-    Q_PROPERTY(bool isStrict READ isStrict)
-
 public:
-    Q_INVOKABLE explicit QUmlProfileApplication(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 QUmlProfileApplication(bool createQObject = true);
+    virtual ~QUmlProfileApplication();
 
-    // Owned attributes [DirectedRelationship]
-    Q_INVOKABLE const QSet<QUmlElement *> source() const;
-    Q_INVOKABLE const QSet<QUmlElement *> target() const;
-
-    // Owned attributes [ProfileApplication]
-    Q_INVOKABLE QUmlProfile *appliedProfile() const;
-    Q_INVOKABLE QUmlPackage *applyingPackage() const;
-    Q_INVOKABLE bool isStrict() 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 [ProfileApplication]
+    // Owned attributes
+    QUmlProfile *appliedProfile() const;
     void setAppliedProfile(QUmlProfile *appliedProfile);
+    QUmlPackage *applyingPackage() const;
     void setApplyingPackage(QUmlPackage *applyingPackage);
+    bool isStrict() const;
     void setStrict(bool isStrict);
+
+protected:
+    QUmlProfile *_appliedProfile;
+    QUmlPackage *_applyingPackage;
+    bool _isStrict;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlProfileApplication *)
-Q_DECLARE_METATYPE(QList<QUmlProfileApplication *> *)
-Q_DECLARE_METATYPE(QSet<QUmlProfileApplication *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlProfileApplication) *)
 
 QT_END_HEADER