1 files changed, 20 insertions, 104 deletions
diff --git a/src/uml/qumlcombinedfragment.h b/src/uml/qumlcombinedfragment.h
index 4ae51a8b..c38f1af9 100644
--- a/src/uml/qumlcombinedfragment.h
+++ b/src/uml/qumlcombinedfragment.h
@@ -43,8 +43,8 @@
 
 #include <QtUml/QtUmlGlobal>
 
-#include <QtCore/QObject>
-#include "private/umlcombinedfragment_p.h"
+#include <QtUml/QUmlInteractionFragment>
+
 
 #include <QtUml/QtUmlNamespace>
 
@@ -54,118 +54,34 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtUml)
 
-class QUmlComment;
-class QUmlDependency;
-class QUmlElement;
 class QUmlGate;
-class QUmlGeneralOrdering;
-class QUmlInteraction;
 class QUmlInteractionOperand;
-class QUmlLifeline;
-class QUmlNamedElement;
-class QUmlNamespace;
-class QUmlPackage;
-class QUmlStringExpression;
 
-class Q_UML_EXPORT QUmlCombinedFragment : public QObject, public UmlCombinedFragment
+class Q_UML_EXPORT QUmlCombinedFragment : public QUmlInteractionFragment
 {
-    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 [InteractionFragment]
-    Q_PROPERTY(QSet<QUmlLifeline *> covered READ covered)
-    Q_PROPERTY(QUmlInteraction * enclosingInteraction READ enclosingInteraction)
-    Q_PROPERTY(QUmlInteractionOperand * enclosingOperand READ enclosingOperand)
-    Q_PROPERTY(QSet<QUmlGeneralOrdering *> generalOrdering READ generalOrdering)
-
-    // Properties [CombinedFragment]
-    Q_PROPERTY(QSet<QUmlGate *> cfragmentGate READ cfragmentGate)
-    Q_PROPERTY(QtUml::InteractionOperatorKind interactionOperator READ interactionOperator)
-    Q_PROPERTY(QList<QUmlInteractionOperand *> operand READ operand)
-
 public:
-    Q_INVOKABLE explicit QUmlCombinedFragment(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 [InteractionFragment]
-    Q_INVOKABLE const QSet<QUmlLifeline *> covered() const;
-    Q_INVOKABLE QUmlInteraction *enclosingInteraction() const;
-    Q_INVOKABLE QUmlInteractionOperand *enclosingOperand() const;
-    Q_INVOKABLE const QSet<QUmlGeneralOrdering *> generalOrdering() const;
-
-    // Owned attributes [CombinedFragment]
-    Q_INVOKABLE const QSet<QUmlGate *> cfragmentGate() const;
-    Q_INVOKABLE QtUml::InteractionOperatorKind interactionOperator() const;
-    Q_INVOKABLE const QList<QUmlInteractionOperand *> operand() 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 [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 [InteractionFragment]
-    void addCovered(UmlLifeline *covered);
-    void removeCovered(UmlLifeline *covered);
-    void setEnclosingInteraction(QUmlInteraction *enclosingInteraction);
-    void setEnclosingOperand(QUmlInteractionOperand *enclosingOperand);
-    void addGeneralOrdering(UmlGeneralOrdering *generalOrdering);
-    void removeGeneralOrdering(UmlGeneralOrdering *generalOrdering);
-
-    // Slots for owned attributes [CombinedFragment]
-    void addCfragmentGate(UmlGate *cfragmentGate);
-    void removeCfragmentGate(UmlGate *cfragmentGate);
+    explicit QUmlCombinedFragment(bool createQObject = true);
+    virtual ~QUmlCombinedFragment();
+
+    // Owned attributes
+    const QSet<QUmlGate *> cfragmentGate() const;
+    void addCfragmentGate(QUmlGate *cfragmentGate);
+    void removeCfragmentGate(QUmlGate *cfragmentGate);
+    QtUml::InteractionOperatorKind interactionOperator() const;
     void setInteractionOperator(QtUml::InteractionOperatorKind interactionOperator);
-    void addOperand(UmlInteractionOperand *operand);
-    void removeOperand(UmlInteractionOperand *operand);
+    const QList<QUmlInteractionOperand *> operand() const;
+    void addOperand(QUmlInteractionOperand *operand);
+    void removeOperand(QUmlInteractionOperand *operand);
+
+protected:
+    QSet<QUmlGate *> _cfragmentGate;
+    QtUml::InteractionOperatorKind _interactionOperator;
+    QList<QUmlInteractionOperand *> _operand;
 };
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QUmlCombinedFragment *)
-Q_DECLARE_METATYPE(QList<QUmlCombinedFragment *> *)
-Q_DECLARE_METATYPE(QSet<QUmlCombinedFragment *> *)
+Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QUmlCombinedFragment) *)
 
 QT_END_HEADER