diff options
Diffstat (limited to 'src/uml/qumlpackagemerge.h')
-rw-r--r-- | src/uml/qumlpackagemerge.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/uml/qumlpackagemerge.h b/src/uml/qumlpackagemerge.h index 26c5fa82..51007821 100644 --- a/src/uml/qumlpackagemerge.h +++ b/src/uml/qumlpackagemerge.h @@ -45,7 +45,6 @@ #include <QtUml/QUmlDirectedRelationship> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -57,10 +56,10 @@ class QUmlPackage; class Q_UML_EXPORT QUmlPackageMerge : public QUmlDirectedRelationship { public: - explicit QUmlPackageMerge(bool createQObject = true); + explicit QUmlPackageMerge(bool createQModelingObject = true); virtual ~QUmlPackageMerge(); - QModelingObject *clone() const; + virtual QModelingElement *clone() const; // Owned attributes QUmlPackage *mergedPackage() const; @@ -71,9 +70,6 @@ public: protected: QUmlPackage *_mergedPackage; QUmlPackage *_receivingPackage; - - virtual void setGroupProperties(); - virtual void setPropertyData(); }; QT_END_NAMESPACE |