summaryrefslogtreecommitdiffstats
path: root/src/uml/qobjects/qumlmergenodeobject_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/uml/qobjects/qumlmergenodeobject_p.h')
-rw-r--r--src/uml/qobjects/qumlmergenodeobject_p.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/uml/qobjects/qumlmergenodeobject_p.h b/src/uml/qobjects/qumlmergenodeobject_p.h
index 4ed12e57..39af4010 100644
--- a/src/uml/qobjects/qumlmergenodeobject_p.h
+++ b/src/uml/qobjects/qumlmergenodeobject_p.h
@@ -43,7 +43,7 @@
#include <QtUml/QtUmlGlobal>
-#include <QtCore/QObject>
+#include <QtModeling/QModelingObject>
#include <QtUml/QtUmlNamespace>
@@ -54,9 +54,12 @@ QT_BEGIN_NAMESPACE
QT_MODULE(QtUml)
class QUmlMergeNode;
-class Q_UML_EXPORT QUmlMergeNodeObject : public QObject
+class QModelingObjectPrivate;
+class Q_UML_EXPORT QUmlMergeNodeObject : public QModelingObject
{
Q_OBJECT
+ Q_DISABLE_COPY(QUmlMergeNodeObject)
+ Q_DECLARE_PRIVATE(QModelingObject)
// Properties [Element]
Q_PROPERTY(QSet<QObject *> ownedComments READ ownedComments)
@@ -87,7 +90,7 @@ class Q_UML_EXPORT QUmlMergeNodeObject : public QObject
Q_PROPERTY(QSet<QObject *> redefinedNodes READ redefinedNodes)
public:
- Q_INVOKABLE explicit QUmlMergeNodeObject(QUmlMergeNode *qModelingObject);
+ Q_INVOKABLE explicit QUmlMergeNodeObject(QUmlMergeNode *qModelingElement);
virtual ~QUmlMergeNodeObject();
// Owned attributes [Element]
@@ -173,6 +176,10 @@ public Q_SLOTS:
void removeOutgoing(QObject *outgoing);
void addRedefinedNode(QObject *redefinedNode);
void removeRedefinedNode(QObject *redefinedNode);
+
+protected:
+ virtual void setGroupProperties();
+ virtual void setPropertyData();
};
QT_END_NAMESPACE