diff options
Diffstat (limited to 'src/uml/qumlmergenode.h')
| -rw-r--r-- | src/uml/qumlmergenode.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/uml/qumlmergenode.h b/src/uml/qumlmergenode.h index 5fd1420d..abdc94ba 100644 --- a/src/uml/qumlmergenode.h +++ b/src/uml/qumlmergenode.h @@ -45,7 +45,6 @@ #include <QtUml/QUmlControlNode> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -55,16 +54,13 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlMergeNode : public QUmlControlNode { public: - explicit QUmlMergeNode(bool createQObject = true); + explicit QUmlMergeNode(bool createQModelingObject = true); virtual ~QUmlMergeNode(); - QModelingObject *clone() const; + virtual QModelingElement *clone() const; protected: - - virtual void setGroupProperties(); - virtual void setPropertyData(); }; QT_END_NAMESPACE |