1 files changed, 12 insertions, 135 deletions

diff --git a/src/uml/qumldecisionnode.h b/src/uml/qumldecisionnode.h
index b3ed6c5a..6815b48b 100644
--- a/src/uml/qumldecisionnode.h
+++ b/src/uml/qumldecisionnode.h
@@ -43,10 +43,8 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umldecisionnode_p.h"
+#include <QtUml/QUmlControlNode>
 
-#include <QtUml/QtUmlNamespace>
 
 QT_BEGIN_HEADER
 
@@ -54,150 +52,29 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtUml)
 
-class QUmlActivity;
-class QUmlActivityEdge;
-class QUmlActivityGroup;
-class QUmlActivityNode;
-class QUmlActivityPartition;
 class QUmlBehavior;
-class QUmlClassifier;
-class QUmlComment;
-class QUmlDependency;
-class QUmlElement;
-class QUmlInterruptibleActivityRegion;
-class QUmlNamedElement;
-class QUmlNamespace;
 class QUmlObjectFlow;
-class QUmlPackage;
-class QUmlRedefinableElement;
-class QUmlStringExpression;
-class QUmlStructuredActivityNode;
 
-class Q_UML_EXPORT QUmlDecisionNode : public QObject, public UmlDecisionNode
+class Q_UML_EXPORT QUmlDecisionNode : public QUmlControlNode
 {
-    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 [RedefinableElement]
-    Q_PROPERTY(bool isLeaf READ isLeaf)
-    Q_PROPERTY(QSet<QUmlRedefinableElement *> redefinedElement READ redefinedElement)
-    Q_PROPERTY(QSet<QUmlClassifier *> redefinitionContext READ redefinitionContext)
-
-    // Properties [ActivityNode]
-    Q_PROPERTY(QUmlActivity * activity READ activity)
-    Q_PROPERTY(QSet<QUmlActivityGroup *> inGroup READ inGroup)
-    Q_PROPERTY(QSet<QUmlInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion)
-    Q_PROPERTY(QSet<QUmlActivityPartition *> inPartition READ inPartition)
-    Q_PROPERTY(QUmlStructuredActivityNode * inStructuredNode READ inStructuredNode)
-    Q_PROPERTY(QSet<QUmlActivityEdge *> incoming READ incoming)
-    Q_PROPERTY(QSet<QUmlActivityEdge *> outgoing READ outgoing)
-    Q_PROPERTY(QSet<QUmlActivityNode *> redefinedNode READ redefinedNode)
-
-    // Properties [DecisionNode]
-    Q_PROPERTY(QUmlBehavior * decisionInput READ decisionInput)
-    Q_PROPERTY(QUmlObjectFlow * decisionInputFlow READ decisionInputFlow)
-
 public:
-    Q_INVOKABLE explicit QUmlDecisionNode(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 [RedefinableElement]
-    Q_INVOKABLE bool isLeaf() const;
-    Q_INVOKABLE const QSet<QUmlRedefinableElement *> redefinedElement() const;
-    Q_INVOKABLE const QSet<QUmlClassifier *> redefinitionContext() const;
-
-    // Owned attributes [ActivityNode]
-    Q_INVOKABLE QUmlActivity *activity() const;
-    Q_INVOKABLE const QSet<QUmlActivityGroup *> inGroup() const;
-    Q_INVOKABLE const QSet<QUmlInterruptibleActivityRegion *> inInterruptibleRegion() const;
-    Q_INVOKABLE const QSet<QUmlActivityPartition *> inPartition() const;
-    Q_INVOKABLE QUmlStructuredActivityNode *inStructuredNode() const;
-    Q_INVOKABLE const QSet<QUmlActivityEdge *> incoming() const;
-    Q_INVOKABLE const QSet<QUmlActivityEdge *> outgoing() const;
-    Q_INVOKABLE const QSet<QUmlActivityNode *> redefinedNode() const;
+    explicit QUmlDecisionNode(bool createQObject = true);
+    virtual ~QUmlDecisionNode();
 
-    // Owned attributes [DecisionNode]
-    Q_INVOKABLE QUmlBehavior *decisionInput() const;
-    Q_INVOKABLE QUmlObjectFlow *decisionInputFlow() 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 [RedefinableElement]
-    Q_INVOKABLE bool isConsistentWith(QUmlRedefinableElement *redefinee) const;
-    Q_INVOKABLE bool isRedefinitionContextValid(QUmlRedefinableElement *redefined) 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 [RedefinableElement]
-    void setLeaf(bool isLeaf);
-
-    // Slots for owned attributes [ActivityNode]
-    void setActivity(QUmlActivity *activity);
-    void addInInterruptibleRegion(UmlInterruptibleActivityRegion *inInterruptibleRegion);
-    void removeInInterruptibleRegion(UmlInterruptibleActivityRegion *inInterruptibleRegion);
-    void addInPartition(UmlActivityPartition *inPartition);
-    void removeInPartition(UmlActivityPartition *inPartition);
-    void setInStructuredNode(QUmlStructuredActivityNode *inStructuredNode);
-    void addIncoming(UmlActivityEdge *incoming);
-    void removeIncoming(UmlActivityEdge *incoming);
-    void addOutgoing(UmlActivityEdge *outgoing);
-    void removeOutgoing(UmlActivityEdge *outgoing);
-    void addRedefinedNode(UmlActivityNode *redefinedNode);
-    void removeRedefinedNode(UmlActivityNode *redefinedNode);
-
-    // Slots for owned attributes [DecisionNode]
+    // Owned attributes
+    QUmlBehavior *decisionInput() const;
     void setDecisionInput(QUmlBehavior *decisionInput);
+    QUmlObjectFlow *decisionInputFlow() const;
     void setDecisionInputFlow(QUmlObjectFlow *decisionInputFlow);
+
+protected:
+    QUmlBehavior *_decisionInput;
+    QUmlObjectFlow *_decisionInputFlow;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlDecisionNode *)
-Q_DECLARE_METATYPE(QList<QUmlDecisionNode *> *)
-Q_DECLARE_METATYPE(QSet<QUmlDecisionNode *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlDecisionNode) *)
 
 QT_END_HEADER