1 files changed, 17 insertions, 152 deletions

diff --git a/src/uml/qumlvariable.h b/src/uml/qumlvariable.h
index fe853899..5732d9d2 100644
--- a/src/uml/qumlvariable.h
+++ b/src/uml/qumlvariable.h
@@ -43,10 +43,9 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umlvariable_p.h"
+#include <QtUml/QUmlMultiplicityElement>
+#include <QtUml/QUmlConnectableElement>
 
-#include <QtUml/QtUmlNamespace>
 
 QT_BEGIN_HEADER
 
@@ -56,165 +55,31 @@ QT_MODULE(QtUml)
 
 class QUmlAction;
 class QUmlActivity;
-class QUmlComment;
-class QUmlConnectableElementTemplateParameter;
-class QUmlConnectorEnd;
-class QUmlDependency;
-class QUmlElement;
-class QUmlMultiplicityElement;
-class QUmlNamedElement;
-class QUmlNamespace;
-class QUmlPackage;
-class QUmlParameterableElement;
-class QUmlStringExpression;
 class QUmlStructuredActivityNode;
-class QUmlTemplateParameter;
-class QUmlType;
-class QUmlValueSpecification;
 
-class Q_UML_EXPORT QUmlVariable : public QObject, public UmlVariable
+class Q_UML_EXPORT QUmlVariable : public QUmlMultiplicityElement, public QUmlConnectableElement
 {
-    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 [MultiplicityElement]
-    Q_PROPERTY(bool isOrdered READ isOrdered)
-    Q_PROPERTY(bool isUnique READ isUnique)
-    Q_PROPERTY(int lower READ lower)
-    Q_PROPERTY(QUmlValueSpecification * lowerValue READ lowerValue)
-    Q_PROPERTY(int upper READ upper)
-    Q_PROPERTY(QUmlValueSpecification * upperValue READ upperValue)
-
-    // 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 [TypedElement]
-    Q_PROPERTY(QUmlType * type READ type)
-
-    // Properties [ParameterableElement]
-    Q_PROPERTY(QUmlTemplateParameter * owningTemplateParameter READ owningTemplateParameter)
-
-    // Properties [ConnectableElement]
-    Q_PROPERTY(QList<QUmlConnectorEnd *> end READ end)
-    Q_PROPERTY(QUmlConnectableElementTemplateParameter * templateParameter READ templateParameter)
-
-    // Properties [Variable]
-    Q_PROPERTY(QUmlActivity * activityScope READ activityScope)
-    Q_PROPERTY(QUmlStructuredActivityNode * scope READ scope)
-
 public:
-    Q_INVOKABLE explicit QUmlVariable(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 [MultiplicityElement]
-    Q_INVOKABLE bool isOrdered() const;
-    Q_INVOKABLE bool isUnique() const;
-    Q_INVOKABLE int lower() const;
-    Q_INVOKABLE QUmlValueSpecification *lowerValue() const;
-    Q_INVOKABLE int upper() const;
-    Q_INVOKABLE QUmlValueSpecification *upperValue() 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 [TypedElement]
-    Q_INVOKABLE QUmlType *type() const;
-
-    // Owned attributes [ParameterableElement]
-    Q_INVOKABLE QUmlTemplateParameter *owningTemplateParameter() const;
-
-    // Owned attributes [ConnectableElement]
-    Q_INVOKABLE const QList<QUmlConnectorEnd *> end() const;
-    Q_INVOKABLE QUmlConnectableElementTemplateParameter *templateParameter() const;
-
-    // Owned attributes [Variable]
-    Q_INVOKABLE QUmlActivity *activityScope() const;
-    Q_INVOKABLE QUmlStructuredActivityNode *scope() const;
-
-    // Operations [Element]
-    Q_INVOKABLE QSet<QUmlElement *> allOwnedElements() const;
-    Q_INVOKABLE bool mustBeOwned() const;
-
-    // Operations [MultiplicityElement]
-    Q_INVOKABLE bool compatibleWith(QUmlMultiplicityElement *other) const;
-    Q_INVOKABLE bool includesCardinality(int C) const;
-    Q_INVOKABLE bool includesMultiplicity(QUmlMultiplicityElement *M) const;
-    Q_INVOKABLE bool is(int lowerbound, int upperbound) const;
-    Q_INVOKABLE bool isMultivalued() const;
-    Q_INVOKABLE int lowerBound() const;
-    Q_INVOKABLE int upperBound() 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 [ParameterableElement]
-    Q_INVOKABLE bool isCompatibleWith(QUmlParameterableElement *p) const;
-    Q_INVOKABLE bool isTemplateParameter() const;
-
-    // Operations [Variable]
-    Q_INVOKABLE bool isAccessibleBy(QUmlAction *a) const;
-
-public Q_SLOTS:
-
-    // Slots for owned attributes [Element]
-    void addOwnedComment(UmlComment *ownedComment);
-    void removeOwnedComment(UmlComment *ownedComment);
-
-    // Slots for owned attributes [MultiplicityElement]
-    void setOrdered(bool isOrdered);
-    void setUnique(bool isUnique);
-    void setLower(int lower);
-    void setLowerValue(QUmlValueSpecification *lowerValue);
-    void setUpper(int upper);
-    void setUpperValue(QUmlValueSpecification *upperValue);
-
-    // 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 [TypedElement]
-    void setType(QUmlType *type);
-
-    // Slots for owned attributes [ParameterableElement]
-    void setOwningTemplateParameter(QUmlTemplateParameter *owningTemplateParameter);
-
-    // Slots for owned attributes [ConnectableElement]
-    void setTemplateParameter(QUmlConnectableElementTemplateParameter *templateParameter);
-
-    // Slots for owned attributes [Variable]
+    explicit QUmlVariable(bool createQObject = true);
+    virtual ~QUmlVariable();
+
+    // Owned attributes
+    QUmlActivity *activityScope() const;
     void setActivityScope(QUmlActivity *activityScope);
+    QUmlStructuredActivityNode *scope() const;
     void setScope(QUmlStructuredActivityNode *scope);
+
+    // Operations
+    bool isAccessibleBy(QUmlAction *a) const;
+
+protected:
+    QUmlActivity *_activityScope;
+    QUmlStructuredActivityNode *_scope;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlVariable *)
-Q_DECLARE_METATYPE(QList<QUmlVariable *> *)
-Q_DECLARE_METATYPE(QSet<QUmlVariable *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlVariable) *)
 
 QT_END_HEADER