diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-08-25 21:01:35 -0300 |
|---|---|---|
| committer | Sandro S. Andrade <sandroandrade@kde.org> | 2013-08-26 02:01:03 +0200 |
| commit | 5392c0a8ce5545783c86d830e8c321d487538613 (patch) | |
| tree | c62cf41f3bb917f5767c9f09d94395d644538fad | |
| parent | 1c770ad764a39ce0ad40913c1c4bd72bd43710a9 (diff) | |
Add dpointer-free UML metamodel implementation
- UML metamodel isn't likely to have changes, therefore we
can get rid of d-pointer and private classes
Change-Id: Id61fd25b965da5ed920e863d047e40ec293c106a
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
735 files changed, 3993 insertions, 23434 deletions
diff --git a/scripts/generate-class.pl b/scripts/generate-class.pl index db9423c3..a9ab7a86 100755 --- a/scripts/generate-class.pl +++ b/scripts/generate-class.pl @@ -68,13 +68,6 @@ foreach my $class ($classset->get_nodelist) { className => $className }) ne 1) { print $tt->error(); } close STDOUT; - open STDOUT, '>', $options{o}."/".$namespace."/q".lc($namespace).lc($className)."_p.h"; - if ($tt->process('class_p.h', { - xmi => $options{i}, - namespace => $namespace, - className => $className - }) ne 1) { print $tt->error(); } - close STDOUT; open STDOUT, '>', $options{o}."/".$namespace."/q".lc($namespace).lc($className).".cpp"; if ($tt->process('class.cpp', { xmi => $options{i}, diff --git a/scripts/templates/class.cpp b/scripts/templates/class.cpp index 622ba55f..c5a0229c 100644 --- a/scripts/templates/class.cpp +++ b/scripts/templates/class.cpp @@ -40,7 +40,6 @@ ** ****************************************************************************/ #include "q${namespace.lower}${className.lower}.h" -#include "q${namespace.lower}${className.lower}_p.h" [%- superclasses = [] -%] [%- SET generalization = class.findnodes("generalization") -%] [%- FOREACH superclass IN generalization -%] @@ -61,7 +60,15 @@ QT_BEGIN_NAMESPACE -Q${namespace}${className}Private::Q${namespace}${className}Private() +/*! + \class Q${namespace}${className} + + \inmodule Qt${namespace} + + \brief ${class.findvalue("ownedComment/body/text()")} + */ + +Q${namespace}${className}::Q${namespace}${className}() [%- SET found = "false" -%] [%- FOREACH attribute = class.findnodes("ownedAttribute[(@isDerived=\"false\" or not(@isDerived)) or (@isDerivedUnion and @isDerivedUnion=\"true\")]") -%] [%- SET defaultType = attribute.findvalue("defaultValue/@xmi:type") -%] @@ -71,59 +78,37 @@ Q${namespace}${className}Private::Q${namespace}${className}Private() [% SET found = "true" -%] [%- ELSE %], [% END -%] - [%- END -%] [%- IF defaultType == "uml:LiteralBoolean" -%] [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%] [%- IF defaultValue != "" -%] - [% QT_ATTRIBUTE(attribute) %](${defaultValue}) + _[% QT_ATTRIBUTE(attribute) %](${defaultValue}) [%- ELSE -%] - [% QT_ATTRIBUTE(attribute) %](false) + _[% QT_ATTRIBUTE(attribute) %](false) [%- END -%] [%- ELSIF defaultType == "uml:InstanceValue" -%] [%- SET defaultInstance = attribute.findvalue("defaultValue/@instance") -%] - [% QT_ATTRIBUTE(attribute) %](Qt${namespace}::${defaultInstance.split("-").0.remove("Kind$").remove("Sort$")}${defaultInstance.split("-").1.ucfirst}) + _[% QT_ATTRIBUTE(attribute) %](Qt${namespace}::${defaultInstance.split("-").0.remove("Kind$").remove("Sort$")}${defaultInstance.split("-").1.ucfirst}) [%- ELSIF defaultType == "uml:LiteralInteger" -%] [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%] [%- IF defaultValue != "" -%] - [% QT_ATTRIBUTE(attribute) %](${defaultValue}) + _[% QT_ATTRIBUTE(attribute) %](${defaultValue}) [%- ELSE -%] - [% QT_ATTRIBUTE(attribute) %](0) + _[% QT_ATTRIBUTE(attribute) %](0) [%- END -%] [%- ELSIF defaultType == "uml:LiteralUnlimitedNatural" -%] [%- SET defaultValue = attribute.findvalue("defaultValue/@value") -%] [%- IF defaultValue != "" -%] - [% QT_ATTRIBUTE(attribute) %](${defaultValue}) + _[% QT_ATTRIBUTE(attribute) %](${defaultValue}) [%- ELSE -%] - [% QT_ATTRIBUTE(attribute) %](0) + _[% QT_ATTRIBUTE(attribute) %](0) [%- END -%] [%- ELSIF type.match('\*$') -%] - [% QT_ATTRIBUTE(attribute) %](0) + _[% QT_ATTRIBUTE(attribute) %](0) + [%- END -%] [%- END -%] [%- END %] { } - -/*! - \class Q${namespace}${className} - - \inmodule Qt${namespace} - - \brief ${class.findvalue("ownedComment/body/text()")} - */ - -Q${namespace}${className}::Q${namespace}${className}(bool create_d_ptr) : -[%- FOREACH superclass IN generalization %] - Q${namespace}${superclass.findvalue("@general")}(false) -[%- IF !loop.last %], -[%- END -%] -[%- END -%] -[%- IF superclasses.size == 0 %] - QModelingObject(false) -[%- END %] -{ - if (create_d_ptr) - set_d_ptr(new Q${namespace}${className}Private); -} [%- FOREACH attribute = class.findnodes("ownedAttribute") %] [%- IF loop.first %] @@ -155,8 +140,7 @@ Q${namespace}${className}::${qtAttribute}() const return ${QT_TYPE(namespace, attribute).trim}(); [%- END %] [%- ELSE %] - QM_D(const Q${namespace}${className}); - return d->${qtAttribute}; + return _${qtAttribute}; [%- END %] } [%- SET attributeName = attribute.findvalue("@name").ucfirst %] @@ -175,9 +159,8 @@ void Q${namespace}${className}::add${attributeName}(${QT_TYPE(namespace, attribu // <derived-code> } [%- ELSE %] - QM_D(Q${namespace}${className}); - if (!d->${qtAttribute}.contains(${qtAttribute})) { - d->${qtAttribute}.[% IF QT_TYPE(namespace, attribute).match("QList") %]append[% ELSE %]insert[% END %](${qtAttribute}); + if (!_${qtAttribute}.contains(${qtAttribute})) { + _${qtAttribute}.[% IF QT_TYPE(namespace, attribute).match("QList") %]append[% ELSE %]insert[% END %](${qtAttribute}); } [%- END %] } @@ -194,9 +177,8 @@ void Q${namespace}${className}::remove${attributeName}(${QT_TYPE(namespace, attr // <derived-code> } [%- ELSE %] - QM_D(Q${namespace}${className}); - if (d->${qtAttribute}.contains(${qtAttribute})) { - d->${qtAttribute}.[% IF QT_TYPE(namespace, attribute).match("QList") %]removeAll[% ELSE %]remove[% END %](${qtAttribute}); + if (_${qtAttribute}.contains(${qtAttribute})) { + _${qtAttribute}.[% IF QT_TYPE(namespace, attribute).match("QList") %]removeAll[% ELSE %]remove[% END %](${qtAttribute}); } [%- END %] } @@ -214,9 +196,8 @@ void Q${namespace}${className}::set${attributeName.remove("^Is")}(${QT_TYPE(name // <derived-code> } [%- ELSE %] - QM_D(Q${namespace}${className}); - if (d->${qtAttribute} != ${qtAttribute}) { - d->${qtAttribute} = ${qtAttribute}; + if (_${qtAttribute} != ${qtAttribute}) { + _${qtAttribute} = ${qtAttribute}; } [%- END %] } diff --git a/scripts/templates/class.h b/scripts/templates/class.h index 23242b12..a7312309 100644 --- a/scripts/templates/class.h +++ b/scripts/templates/class.h @@ -80,7 +80,6 @@ class ${forward}; [% END %] [%- END -%] -class Q${namespace}${className}Private; class Q_${namespace.upper}_EXPORT Q${namespace}${className} : [%- FOREACH superclass IN generalization -%] public Q${namespace}${superclass.findvalue("@general")} @@ -91,7 +90,7 @@ public QModelingObject [%- END %] { public: - [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% END %]Q${namespace}${className}(bool create_d_ptr = true); + [% IF class.findvalue("@isAbstract") == "true" %]Q_DECL_HIDDEN [% END %]Q${namespace}${className}(); [%- FOREACH attribute = class.findnodes("ownedAttribute") -%] [%- IF loop.first %] @@ -126,6 +125,11 @@ ${parameter.findvalue("@name")} [%- END -%] )[% IF operation.findvalue("@isQuery") == "true" %] const[% END %]; [%- END %] + +protected: +[%- FOREACH attribute = class.findnodes("ownedAttribute[(@isDerived=\"false\" or not(@isDerived)) or (@isDerivedUnion and @isDerivedUnion=\"true\")]") %] + [% QT_TYPE(namespace, attribute) -%]_[%- QT_ATTRIBUTE(attribute) %]; +[%- END %] }; QT_END_NAMESPACE diff --git a/scripts/templates/class_p.h b/scripts/templates/class_p.h deleted file mode 100644 index 31e6eb30..00000000 --- a/scripts/templates/class_p.h +++ /dev/null @@ -1,86 +0,0 @@ -[%- PROCESS common.tmpl -%] -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt${namespace} module of the Qt Toolkit. -** -** \$QT_BEGIN_LICENSE:LGPL\$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** \$QT_END_LICENSE\$ -** -****************************************************************************/ -#ifndef Q${namespace.upper}${className.upper}_P_H -#define Q${namespace.upper}${className.upper}_P_H - -#include "Qt${namespace}/Q${namespace}${className}" - -[%- SET generalization = class.findnodes('generalization') -%] -[% superclasses = [] -%] -[%- FOREACH superclass IN generalization %] -#include "private/q${namespace.lower}${superclass.findvalue('@general').lower}_p.h" -[%- superclasses.push("Q${namespace}${superclassName}") -%] -[%- IF loop.last %] -[% END -%] -[%- END %] -[%- IF superclasses.size == 0 %] -#include "private/qmodelingobject_p.h" -[% END %] -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Qt${namespace}) - -class Q_${namespace.upper}_EXPORT Q${namespace}${className}Private : -[%- FOREACH superclass IN generalization -%] -public Q${namespace}${superclass.findvalue('@general')}Private -[%- IF !loop.last %], [% END -%] -[%- END %] -[%- IF superclasses.size == 0 -%] -public QModelingObjectPrivate -[%- END %] -{ -public: - Q${namespace}${className}Private(); - -[%- FOREACH attribute = class.findnodes("ownedAttribute[(@isDerived=\"false\" or not(@isDerived)) or (@isDerivedUnion and @isDerivedUnion=\"true\")]") %] - [% QT_TYPE(namespace, attribute) -%][%- QT_ATTRIBUTE(attribute) %]; -[%- END %] -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // Q${namespace.upper}${className.upper}_P_H - diff --git a/scripts/templates/module.pri b/scripts/templates/module.pri index 0dd4307a..4c1784a3 100644 --- a/scripts/templates/module.pri +++ b/scripts/templates/module.pri @@ -1,5 +1,5 @@ [% USE xmi = XML.XPath("$xmi") -%] -PUBLIC_HEADERS += \ +HEADERS += \ qt${namespace.lower}global.h \ qt${namespace.lower}namespace.h [%- FOREACH class = xmi.findnodes('//packagedElement[@xmi:type=\'uml:Class\']') -%] @@ -7,12 +7,6 @@ PUBLIC_HEADERS += \ q${namespace.lower}${class.findvalue('@name').lower}.h [%- END %] -PRIVATE_HEADERS += -[%- FOREACH class = xmi.findnodes('//packagedElement[@xmi:type=\'uml:Class\']') -%] - \ - q${namespace.lower}${class.findvalue('@name').lower}_p.h -[%- END %] - SOURCES += \ qt${namespace.lower}namespace.cpp [%- FOREACH class = xmi.findnodes('//packagedElement[@xmi:type=\'uml:Class\']') -%] diff --git a/scripts/templates/module.pro b/scripts/templates/module.pro index b2f2eea0..b88feb62 100644 --- a/scripts/templates/module.pro +++ b/scripts/templates/module.pro @@ -8,5 +8,3 @@ QMAKE_DOCS = [%- GET '$$PWD' -%]/doc/qt${namespace.lower}.qdocconf load(qt_module) include(${namespace.lower}.pri) - -HEADERS += [%- GET '$$PUBLIC_HEADERS' -%] [% GET '$$PRIVATE_HEADERS' -%] diff --git a/src/modeling/qmodelingobject.cpp b/src/modeling/qmodelingobject.cpp index b60eee64..2ead4b37 100644 --- a/src/modeling/qmodelingobject.cpp +++ b/src/modeling/qmodelingobject.cpp @@ -5,7 +5,8 @@ QModelingObjectPrivate::~QModelingObjectPrivate() { } -QModelingObject::QModelingObject(bool create_d_ptr) +QModelingObject::QModelingObject(bool create_d_ptr) : + d_ptr(0) { if (create_d_ptr) set_d_ptr(new QModelingObjectPrivate); @@ -18,6 +19,7 @@ QModelingObject::~QModelingObject() void QModelingObject::set_d_ptr(QModelingObjectPrivate *d_ptr) { + Q_ASSERT_X(!this->d_ptr, "QModelingObject::set_d_ptr", "d_ptr already set !"); this->d_ptr = d_ptr; d_ptr->q_ptr = this; } diff --git a/src/uml/qumlabstraction.cpp b/src/uml/qumlabstraction.cpp index 06299dfe..1bae0322 100644 --- a/src/uml/qumlabstraction.cpp +++ b/src/uml/qumlabstraction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlabstraction.h" -#include "qumlabstraction_p.h" #include <QtUml/QUmlOpaqueExpression> QT_BEGIN_NAMESPACE -QUmlAbstractionPrivate::QUmlAbstractionPrivate() : - mapping(0) -{ -} - /*! \class QUmlAbstraction @@ -58,11 +52,9 @@ QUmlAbstractionPrivate::QUmlAbstractionPrivate() : \brief An abstraction is a relationship that relates two elements or sets of elements that represent the same concept at different levels of abstraction or from different viewpoints. */ -QUmlAbstraction::QUmlAbstraction(bool create_d_ptr) : - QUmlDependency(false) +QUmlAbstraction::QUmlAbstraction() : + _mapping(0) { - if (create_d_ptr) - set_d_ptr(new QUmlAbstractionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOpaqueExpression *QUmlAbstraction::mapping() const { // This is a read-write association end - QM_D(const QUmlAbstraction); - return d->mapping; + return _mapping; } void QUmlAbstraction::setMapping(QUmlOpaqueExpression *mapping) { // This is a read-write association end - QM_D(QUmlAbstraction); - if (d->mapping != mapping) { - d->mapping = mapping; + if (_mapping != mapping) { + _mapping = mapping; } } diff --git a/src/uml/qumlabstraction.h b/src/uml/qumlabstraction.h index 633e2806..ec7fcc95 100644 --- a/src/uml/qumlabstraction.h +++ b/src/uml/qumlabstraction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOpaqueExpression; -class QUmlAbstractionPrivate; class Q_UML_EXPORT QUmlAbstraction : public QUmlDependency { public: - QUmlAbstraction(bool create_d_ptr = true); + QUmlAbstraction(); // Owned attributes QUmlOpaqueExpression *mapping() const; void setMapping(QUmlOpaqueExpression *mapping); + +protected: + QUmlOpaqueExpression *_mapping; }; QT_END_NAMESPACE diff --git a/src/uml/qumlabstraction_p.h b/src/uml/qumlabstraction_p.h deleted file mode 100644 index 0b81b830..00000000 --- a/src/uml/qumlabstraction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLABSTRACTION_P_H -#define QUMLABSTRACTION_P_H - -#include "QtUml/QUmlAbstraction" - -#include "private/qumldependency_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAbstractionPrivate : public QUmlDependencyPrivate -{ -public: - QUmlAbstractionPrivate(); - - QUmlOpaqueExpression *mapping; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLABSTRACTION_P_H - diff --git a/src/uml/qumlacceptcallaction.cpp b/src/uml/qumlacceptcallaction.cpp index 9d912481..241f884e 100644 --- a/src/uml/qumlacceptcallaction.cpp +++ b/src/uml/qumlacceptcallaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlacceptcallaction.h" -#include "qumlacceptcallaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlAcceptCallActionPrivate::QUmlAcceptCallActionPrivate() : - returnInformation(0) -{ -} - /*! \class QUmlAcceptCallAction @@ -58,11 +52,9 @@ QUmlAcceptCallActionPrivate::QUmlAcceptCallActionPrivate() : \brief An accept call action is an accept event action representing the receipt of a synchronous call request. In addition to the normal operation parameters, the action produces an output that is needed later to supply the information to the reply action necessary to return control to the caller. This action is for synchronous calls. If it is used to handle an asynchronous call, execution of the subsequent reply action will complete immediately with no effects. */ -QUmlAcceptCallAction::QUmlAcceptCallAction(bool create_d_ptr) : - QUmlAcceptEventAction(false) +QUmlAcceptCallAction::QUmlAcceptCallAction() : + _returnInformation(0) { - if (create_d_ptr) - set_d_ptr(new QUmlAcceptCallActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOutputPin *QUmlAcceptCallAction::returnInformation() const { // This is a read-write association end - QM_D(const QUmlAcceptCallAction); - return d->returnInformation; + return _returnInformation; } void QUmlAcceptCallAction::setReturnInformation(QUmlOutputPin *returnInformation) { // This is a read-write association end - QM_D(QUmlAcceptCallAction); - if (d->returnInformation != returnInformation) { - d->returnInformation = returnInformation; + if (_returnInformation != returnInformation) { + _returnInformation = returnInformation; } } diff --git a/src/uml/qumlacceptcallaction.h b/src/uml/qumlacceptcallaction.h index 05bd89cf..229a3cfc 100644 --- a/src/uml/qumlacceptcallaction.h +++ b/src/uml/qumlacceptcallaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlAcceptCallActionPrivate; class Q_UML_EXPORT QUmlAcceptCallAction : public QUmlAcceptEventAction { public: - QUmlAcceptCallAction(bool create_d_ptr = true); + QUmlAcceptCallAction(); // Owned attributes QUmlOutputPin *returnInformation() const; void setReturnInformation(QUmlOutputPin *returnInformation); + +protected: + QUmlOutputPin *_returnInformation; }; QT_END_NAMESPACE diff --git a/src/uml/qumlacceptcallaction_p.h b/src/uml/qumlacceptcallaction_p.h deleted file mode 100644 index 90211425..00000000 --- a/src/uml/qumlacceptcallaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACCEPTCALLACTION_P_H -#define QUMLACCEPTCALLACTION_P_H - -#include "QtUml/QUmlAcceptCallAction" - -#include "private/qumlaccepteventaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAcceptCallActionPrivate : public QUmlAcceptEventActionPrivate -{ -public: - QUmlAcceptCallActionPrivate(); - - QUmlOutputPin *returnInformation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACCEPTCALLACTION_P_H - diff --git a/src/uml/qumlaccepteventaction.cpp b/src/uml/qumlaccepteventaction.cpp index 6184064b..2e495e85 100644 --- a/src/uml/qumlaccepteventaction.cpp +++ b/src/uml/qumlaccepteventaction.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlaccepteventaction.h" -#include "qumlaccepteventaction_p.h" #include <QtUml/QUmlOutputPin> #include <QtUml/QUmlTrigger> QT_BEGIN_NAMESPACE -QUmlAcceptEventActionPrivate::QUmlAcceptEventActionPrivate() : - isUnmarshall(false) -{ -} - /*! \class QUmlAcceptEventAction @@ -59,11 +53,9 @@ QUmlAcceptEventActionPrivate::QUmlAcceptEventActionPrivate() : \brief A accept event action is an action that waits for the occurrence of an event meeting specified conditions. */ -QUmlAcceptEventAction::QUmlAcceptEventAction(bool create_d_ptr) : - QUmlAction(false) +QUmlAcceptEventAction::QUmlAcceptEventAction() : + _isUnmarshall(false) { - if (create_d_ptr) - set_d_ptr(new QUmlAcceptEventActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ bool QUmlAcceptEventAction::isUnmarshall() const { // This is a read-write property - QM_D(const QUmlAcceptEventAction); - return d->isUnmarshall; + return _isUnmarshall; } void QUmlAcceptEventAction::setUnmarshall(bool isUnmarshall) { // This is a read-write property - QM_D(QUmlAcceptEventAction); - if (d->isUnmarshall != isUnmarshall) { - d->isUnmarshall = isUnmarshall; + if (_isUnmarshall != isUnmarshall) { + _isUnmarshall = isUnmarshall; } } @@ -96,17 +86,15 @@ QSet<QUmlOutputPin *> QUmlAcceptEventAction::result() const { // This is a read-write association end - QM_D(const QUmlAcceptEventAction); - return d->result; + return _result; } void QUmlAcceptEventAction::addResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlAcceptEventAction); - if (!d->result.contains(result)) { - d->result.insert(result); + if (!_result.contains(result)) { + _result.insert(result); } } @@ -114,9 +102,8 @@ void QUmlAcceptEventAction::removeResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlAcceptEventAction); - if (d->result.contains(result)) { - d->result.remove(result); + if (_result.contains(result)) { + _result.remove(result); } } @@ -127,17 +114,15 @@ QSet<QUmlTrigger *> QUmlAcceptEventAction::trigger() const { // This is a read-write association end - QM_D(const QUmlAcceptEventAction); - return d->trigger; + return _trigger; } void QUmlAcceptEventAction::addTrigger(QUmlTrigger *trigger) { // This is a read-write association end - QM_D(QUmlAcceptEventAction); - if (!d->trigger.contains(trigger)) { - d->trigger.insert(trigger); + if (!_trigger.contains(trigger)) { + _trigger.insert(trigger); } } @@ -145,9 +130,8 @@ void QUmlAcceptEventAction::removeTrigger(QUmlTrigger *trigger) { // This is a read-write association end - QM_D(QUmlAcceptEventAction); - if (d->trigger.contains(trigger)) { - d->trigger.remove(trigger); + if (_trigger.contains(trigger)) { + _trigger.remove(trigger); } } diff --git a/src/uml/qumlaccepteventaction.h b/src/uml/qumlaccepteventaction.h index f7247ab9..65aa3c3d 100644 --- a/src/uml/qumlaccepteventaction.h +++ b/src/uml/qumlaccepteventaction.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlOutputPin; class QUmlTrigger; -class QUmlAcceptEventActionPrivate; class Q_UML_EXPORT QUmlAcceptEventAction : public QUmlAction { public: - QUmlAcceptEventAction(bool create_d_ptr = true); + QUmlAcceptEventAction(); // Owned attributes bool isUnmarshall() const; @@ -69,6 +68,11 @@ public: QSet<QUmlTrigger *> trigger() const; void addTrigger(QUmlTrigger *trigger); void removeTrigger(QUmlTrigger *trigger); + +protected: + bool _isUnmarshall; + QSet<QUmlOutputPin *> _result; + QSet<QUmlTrigger *> _trigger; }; QT_END_NAMESPACE diff --git a/src/uml/qumlaccepteventaction_p.h b/src/uml/qumlaccepteventaction_p.h deleted file mode 100644 index b38954d7..00000000 --- a/src/uml/qumlaccepteventaction_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACCEPTEVENTACTION_P_H -#define QUMLACCEPTEVENTACTION_P_H - -#include "QtUml/QUmlAcceptEventAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAcceptEventActionPrivate : public QUmlActionPrivate -{ -public: - QUmlAcceptEventActionPrivate(); - - bool isUnmarshall; - QSet<QUmlOutputPin *> result; - QSet<QUmlTrigger *> trigger; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACCEPTEVENTACTION_P_H - diff --git a/src/uml/qumlaction.cpp b/src/uml/qumlaction.cpp index 346189ee..ae484f15 100644 --- a/src/uml/qumlaction.cpp +++ b/src/uml/qumlaction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlaction.h" -#include "qumlaction_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlConstraint> @@ -48,11 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlActionPrivate::QUmlActionPrivate() : - isLocallyReentrant(false) -{ -} - /*! \class QUmlAction @@ -61,11 +55,9 @@ QUmlActionPrivate::QUmlActionPrivate() : \brief An action has pre- and post-conditions.An action represents a single step within an activity, that is, one that is not further decomposed within the activity.An action is a named element that is the fundamental unit of executable functionality. The execution of an action represents some transformation or processing in the modeled system, be it a computer system or otherwise. */ -QUmlAction::QUmlAction(bool create_d_ptr) : - QUmlExecutableNode(false) +QUmlAction::QUmlAction() : + _isLocallyReentrant(false) { - if (create_d_ptr) - set_d_ptr(new QUmlActionPrivate); } // OWNED ATTRIBUTES @@ -89,8 +81,7 @@ QList<QUmlInputPin *> QUmlAction::input() const { // This is a read-only derived union association end - QM_D(const QUmlAction); - return d->input; + return _input; } /*! @@ -100,17 +91,15 @@ bool QUmlAction::isLocallyReentrant() const { // This is a read-write property - QM_D(const QUmlAction); - return d->isLocallyReentrant; + return _isLocallyReentrant; } void QUmlAction::setLocallyReentrant(bool isLocallyReentrant) { // This is a read-write property - QM_D(QUmlAction); - if (d->isLocallyReentrant != isLocallyReentrant) { - d->isLocallyReentrant = isLocallyReentrant; + if (_isLocallyReentrant != isLocallyReentrant) { + _isLocallyReentrant = isLocallyReentrant; } } @@ -121,17 +110,15 @@ QSet<QUmlConstraint *> QUmlAction::localPostcondition() const { // This is a read-write association end - QM_D(const QUmlAction); - return d->localPostcondition; + return _localPostcondition; } void QUmlAction::addLocalPostcondition(QUmlConstraint *localPostcondition) { // This is a read-write association end - QM_D(QUmlAction); - if (!d->localPostcondition.contains(localPostcondition)) { - d->localPostcondition.insert(localPostcondition); + if (!_localPostcondition.contains(localPostcondition)) { + _localPostcondition.insert(localPostcondition); } } @@ -139,9 +126,8 @@ void QUmlAction::removeLocalPostcondition(QUmlConstraint *localPostcondition) { // This is a read-write association end - QM_D(QUmlAction); - if (d->localPostcondition.contains(localPostcondition)) { - d->localPostcondition.remove(localPostcondition); + if (_localPostcondition.contains(localPostcondition)) { + _localPostcondition.remove(localPostcondition); } } @@ -152,17 +138,15 @@ QSet<QUmlConstraint *> QUmlAction::localPrecondition() const { // This is a read-write association end - QM_D(const QUmlAction); - return d->localPrecondition; + return _localPrecondition; } void QUmlAction::addLocalPrecondition(QUmlConstraint *localPrecondition) { // This is a read-write association end - QM_D(QUmlAction); - if (!d->localPrecondition.contains(localPrecondition)) { - d->localPrecondition.insert(localPrecondition); + if (!_localPrecondition.contains(localPrecondition)) { + _localPrecondition.insert(localPrecondition); } } @@ -170,9 +154,8 @@ void QUmlAction::removeLocalPrecondition(QUmlConstraint *localPrecondition) { // This is a read-write association end - QM_D(QUmlAction); - if (d->localPrecondition.contains(localPrecondition)) { - d->localPrecondition.remove(localPrecondition); + if (_localPrecondition.contains(localPrecondition)) { + _localPrecondition.remove(localPrecondition); } } @@ -183,8 +166,7 @@ QList<QUmlOutputPin *> QUmlAction::output() const { // This is a read-only derived union association end - QM_D(const QUmlAction); - return d->output; + return _output; } QT_END_NAMESPACE diff --git a/src/uml/qumlaction.h b/src/uml/qumlaction.h index 77a894e5..2b873645 100644 --- a/src/uml/qumlaction.h +++ b/src/uml/qumlaction.h @@ -56,11 +56,10 @@ class QUmlConstraint; class QUmlInputPin; class QUmlOutputPin; -class QUmlActionPrivate; class Q_UML_EXPORT QUmlAction : public QUmlExecutableNode { public: - Q_DECL_HIDDEN QUmlAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlAction(); // Owned attributes QUmlClassifier *context() const; @@ -74,6 +73,13 @@ public: void addLocalPrecondition(QUmlConstraint *localPrecondition); void removeLocalPrecondition(QUmlConstraint *localPrecondition); QList<QUmlOutputPin *> output() const; + +protected: + QList<QUmlInputPin *> _input; + bool _isLocallyReentrant; + QSet<QUmlConstraint *> _localPostcondition; + QSet<QUmlConstraint *> _localPrecondition; + QList<QUmlOutputPin *> _output; }; QT_END_NAMESPACE diff --git a/src/uml/qumlaction_p.h b/src/uml/qumlaction_p.h deleted file mode 100644 index b56e034d..00000000 --- a/src/uml/qumlaction_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTION_P_H -#define QUMLACTION_P_H - -#include "QtUml/QUmlAction" - -#include "private/qumlexecutablenode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActionPrivate : public QUmlExecutableNodePrivate -{ -public: - QUmlActionPrivate(); - - QList<QUmlInputPin *> input; - bool isLocallyReentrant; - QSet<QUmlConstraint *> localPostcondition; - QSet<QUmlConstraint *> localPrecondition; - QList<QUmlOutputPin *> output; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTION_P_H - diff --git a/src/uml/qumlactionexecutionspecification.cpp b/src/uml/qumlactionexecutionspecification.cpp index 1d11c7b9..2da1d63f 100644 --- a/src/uml/qumlactionexecutionspecification.cpp +++ b/src/uml/qumlactionexecutionspecification.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlactionexecutionspecification.h" -#include "qumlactionexecutionspecification_p.h" #include <QtUml/QUmlAction> QT_BEGIN_NAMESPACE -QUmlActionExecutionSpecificationPrivate::QUmlActionExecutionSpecificationPrivate() : - action(0) -{ -} - /*! \class QUmlActionExecutionSpecification @@ -58,11 +52,9 @@ QUmlActionExecutionSpecificationPrivate::QUmlActionExecutionSpecificationPrivate \brief An action execution specification is a kind of execution specification representing the execution of an action. */ -QUmlActionExecutionSpecification::QUmlActionExecutionSpecification(bool create_d_ptr) : - QUmlExecutionSpecification(false) +QUmlActionExecutionSpecification::QUmlActionExecutionSpecification() : + _action(0) { - if (create_d_ptr) - set_d_ptr(new QUmlActionExecutionSpecificationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlAction *QUmlActionExecutionSpecification::action() const { // This is a read-write association end - QM_D(const QUmlActionExecutionSpecification); - return d->action; + return _action; } void QUmlActionExecutionSpecification::setAction(QUmlAction *action) { // This is a read-write association end - QM_D(QUmlActionExecutionSpecification); - if (d->action != action) { - d->action = action; + if (_action != action) { + _action = action; } } diff --git a/src/uml/qumlactionexecutionspecification.h b/src/uml/qumlactionexecutionspecification.h index 65c5a857..b1ee2f60 100644 --- a/src/uml/qumlactionexecutionspecification.h +++ b/src/uml/qumlactionexecutionspecification.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlAction; -class QUmlActionExecutionSpecificationPrivate; class Q_UML_EXPORT QUmlActionExecutionSpecification : public QUmlExecutionSpecification { public: - QUmlActionExecutionSpecification(bool create_d_ptr = true); + QUmlActionExecutionSpecification(); // Owned attributes QUmlAction *action() const; void setAction(QUmlAction *action); + +protected: + QUmlAction *_action; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactionexecutionspecification_p.h b/src/uml/qumlactionexecutionspecification_p.h deleted file mode 100644 index b3dd1166..00000000 --- a/src/uml/qumlactionexecutionspecification_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIONEXECUTIONSPECIFICATION_P_H -#define QUMLACTIONEXECUTIONSPECIFICATION_P_H - -#include "QtUml/QUmlActionExecutionSpecification" - -#include "private/qumlexecutionspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActionExecutionSpecificationPrivate : public QUmlExecutionSpecificationPrivate -{ -public: - QUmlActionExecutionSpecificationPrivate(); - - QUmlAction *action; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIONEXECUTIONSPECIFICATION_P_H - diff --git a/src/uml/qumlactioninputpin.cpp b/src/uml/qumlactioninputpin.cpp index e32fa24f..823f5880 100644 --- a/src/uml/qumlactioninputpin.cpp +++ b/src/uml/qumlactioninputpin.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlactioninputpin.h" -#include "qumlactioninputpin_p.h" #include <QtUml/QUmlAction> QT_BEGIN_NAMESPACE -QUmlActionInputPinPrivate::QUmlActionInputPinPrivate() : - fromAction(0) -{ -} - /*! \class QUmlActionInputPin @@ -58,11 +52,9 @@ QUmlActionInputPinPrivate::QUmlActionInputPinPrivate() : \brief An action input pin is a kind of pin that executes an action to determine the values to input to another. */ -QUmlActionInputPin::QUmlActionInputPin(bool create_d_ptr) : - QUmlInputPin(false) +QUmlActionInputPin::QUmlActionInputPin() : + _fromAction(0) { - if (create_d_ptr) - set_d_ptr(new QUmlActionInputPinPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlAction *QUmlActionInputPin::fromAction() const { // This is a read-write association end - QM_D(const QUmlActionInputPin); - return d->fromAction; + return _fromAction; } void QUmlActionInputPin::setFromAction(QUmlAction *fromAction) { // This is a read-write association end - QM_D(QUmlActionInputPin); - if (d->fromAction != fromAction) { - d->fromAction = fromAction; + if (_fromAction != fromAction) { + _fromAction = fromAction; } } diff --git a/src/uml/qumlactioninputpin.h b/src/uml/qumlactioninputpin.h index b5eaefac..51b65a0d 100644 --- a/src/uml/qumlactioninputpin.h +++ b/src/uml/qumlactioninputpin.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlAction; -class QUmlActionInputPinPrivate; class Q_UML_EXPORT QUmlActionInputPin : public QUmlInputPin { public: - QUmlActionInputPin(bool create_d_ptr = true); + QUmlActionInputPin(); // Owned attributes QUmlAction *fromAction() const; void setFromAction(QUmlAction *fromAction); + +protected: + QUmlAction *_fromAction; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactioninputpin_p.h b/src/uml/qumlactioninputpin_p.h deleted file mode 100644 index a15fd79b..00000000 --- a/src/uml/qumlactioninputpin_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIONINPUTPIN_P_H -#define QUMLACTIONINPUTPIN_P_H - -#include "QtUml/QUmlActionInputPin" - -#include "private/qumlinputpin_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActionInputPinPrivate : public QUmlInputPinPrivate -{ -public: - QUmlActionInputPinPrivate(); - - QUmlAction *fromAction; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIONINPUTPIN_P_H - diff --git a/src/uml/qumlactivity.cpp b/src/uml/qumlactivity.cpp index 358b897a..fffc56e1 100644 --- a/src/uml/qumlactivity.cpp +++ b/src/uml/qumlactivity.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlactivity.h" -#include "qumlactivity_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityGroup> @@ -50,12 +49,6 @@ QT_BEGIN_NAMESPACE -QUmlActivityPrivate::QUmlActivityPrivate() : - isReadOnly(false), - isSingleExecution(false) -{ -} - /*! \class QUmlActivity @@ -64,11 +57,10 @@ QUmlActivityPrivate::QUmlActivityPrivate() : \brief An activity is the specification of parameterized behavior as the coordinated sequencing of subordinate units whose individual elements are actions. */ -QUmlActivity::QUmlActivity(bool create_d_ptr) : - QUmlBehavior(false) +QUmlActivity::QUmlActivity() : + _isReadOnly(false), + _isSingleExecution(false) { - if (create_d_ptr) - set_d_ptr(new QUmlActivityPrivate); } // OWNED ATTRIBUTES @@ -80,17 +72,15 @@ QSet<QUmlActivityEdge *> QUmlActivity::edge() const { // This is a read-write association end - QM_D(const QUmlActivity); - return d->edge; + return _edge; } void QUmlActivity::addEdge(QUmlActivityEdge *edge) { // This is a read-write association end - QM_D(QUmlActivity); - if (!d->edge.contains(edge)) { - d->edge.insert(edge); + if (!_edge.contains(edge)) { + _edge.insert(edge); } } @@ -98,9 +88,8 @@ void QUmlActivity::removeEdge(QUmlActivityEdge *edge) { // This is a read-write association end - QM_D(QUmlActivity); - if (d->edge.contains(edge)) { - d->edge.remove(edge); + if (_edge.contains(edge)) { + _edge.remove(edge); } } @@ -111,17 +100,15 @@ QSet<QUmlActivityGroup *> QUmlActivity::group() const { // This is a read-write association end - QM_D(const QUmlActivity); - return d->group; + return _group; } void QUmlActivity::addGroup(QUmlActivityGroup *group) { // This is a read-write association end - QM_D(QUmlActivity); - if (!d->group.contains(group)) { - d->group.insert(group); + if (!_group.contains(group)) { + _group.insert(group); } } @@ -129,9 +116,8 @@ void QUmlActivity::removeGroup(QUmlActivityGroup *group) { // This is a read-write association end - QM_D(QUmlActivity); - if (d->group.contains(group)) { - d->group.remove(group); + if (_group.contains(group)) { + _group.remove(group); } } @@ -142,17 +128,15 @@ bool QUmlActivity::isReadOnly() const { // This is a read-write property - QM_D(const QUmlActivity); - return d->isReadOnly; + return _isReadOnly; } void QUmlActivity::setReadOnly(bool isReadOnly) { // This is a read-write property - QM_D(QUmlActivity); - if (d->isReadOnly != isReadOnly) { - d->isReadOnly = isReadOnly; + if (_isReadOnly != isReadOnly) { + _isReadOnly = isReadOnly; } } @@ -163,17 +147,15 @@ bool QUmlActivity::isSingleExecution() const { // This is a read-write property - QM_D(const QUmlActivity); - return d->isSingleExecution; + return _isSingleExecution; } void QUmlActivity::setSingleExecution(bool isSingleExecution) { // This is a read-write property - QM_D(QUmlActivity); - if (d->isSingleExecution != isSingleExecution) { - d->isSingleExecution = isSingleExecution; + if (_isSingleExecution != isSingleExecution) { + _isSingleExecution = isSingleExecution; } } @@ -184,17 +166,15 @@ QSet<QUmlActivityNode *> QUmlActivity::node() const { // This is a read-write association end - QM_D(const QUmlActivity); - return d->node; + return _node; } void QUmlActivity::addNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlActivity); - if (!d->node.contains(node)) { - d->node.insert(node); + if (!_node.contains(node)) { + _node.insert(node); } } @@ -202,9 +182,8 @@ void QUmlActivity::removeNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlActivity); - if (d->node.contains(node)) { - d->node.remove(node); + if (_node.contains(node)) { + _node.remove(node); } } @@ -215,17 +194,15 @@ QSet<QUmlActivityPartition *> QUmlActivity::partition() const { // This is a read-write association end - QM_D(const QUmlActivity); - return d->partition; + return _partition; } void QUmlActivity::addPartition(QUmlActivityPartition *partition) { // This is a read-write association end - QM_D(QUmlActivity); - if (!d->partition.contains(partition)) { - d->partition.insert(partition); + if (!_partition.contains(partition)) { + _partition.insert(partition); } } @@ -233,9 +210,8 @@ void QUmlActivity::removePartition(QUmlActivityPartition *partition) { // This is a read-write association end - QM_D(QUmlActivity); - if (d->partition.contains(partition)) { - d->partition.remove(partition); + if (_partition.contains(partition)) { + _partition.remove(partition); } } @@ -246,17 +222,15 @@ QSet<QUmlStructuredActivityNode *> QUmlActivity::structuredNode() const { // This is a read-write association end - QM_D(const QUmlActivity); - return d->structuredNode; + return _structuredNode; } void QUmlActivity::addStructuredNode(QUmlStructuredActivityNode *structuredNode) { // This is a read-write association end - QM_D(QUmlActivity); - if (!d->structuredNode.contains(structuredNode)) { - d->structuredNode.insert(structuredNode); + if (!_structuredNode.contains(structuredNode)) { + _structuredNode.insert(structuredNode); } } @@ -264,9 +238,8 @@ void QUmlActivity::removeStructuredNode(QUmlStructuredActivityNode *structuredNo { // This is a read-write association end - QM_D(QUmlActivity); - if (d->structuredNode.contains(structuredNode)) { - d->structuredNode.remove(structuredNode); + if (_structuredNode.contains(structuredNode)) { + _structuredNode.remove(structuredNode); } } @@ -277,17 +250,15 @@ QSet<QUmlVariable *> QUmlActivity::variable() const { // This is a read-write association end - QM_D(const QUmlActivity); - return d->variable; + return _variable; } void QUmlActivity::addVariable(QUmlVariable *variable) { // This is a read-write association end - QM_D(QUmlActivity); - if (!d->variable.contains(variable)) { - d->variable.insert(variable); + if (!_variable.contains(variable)) { + _variable.insert(variable); } } @@ -295,9 +266,8 @@ void QUmlActivity::removeVariable(QUmlVariable *variable) { // This is a read-write association end - QM_D(QUmlActivity); - if (d->variable.contains(variable)) { - d->variable.remove(variable); + if (_variable.contains(variable)) { + _variable.remove(variable); } } diff --git a/src/uml/qumlactivity.h b/src/uml/qumlactivity.h index 02e105c2..268180e6 100644 --- a/src/uml/qumlactivity.h +++ b/src/uml/qumlactivity.h @@ -58,11 +58,10 @@ class QUmlActivityPartition; class QUmlStructuredActivityNode; class QUmlVariable; -class QUmlActivityPrivate; class Q_UML_EXPORT QUmlActivity : public QUmlBehavior { public: - QUmlActivity(bool create_d_ptr = true); + QUmlActivity(); // Owned attributes QSet<QUmlActivityEdge *> edge() const; @@ -87,6 +86,16 @@ public: QSet<QUmlVariable *> variable() const; void addVariable(QUmlVariable *variable); void removeVariable(QUmlVariable *variable); + +protected: + QSet<QUmlActivityEdge *> _edge; + QSet<QUmlActivityGroup *> _group; + bool _isReadOnly; + bool _isSingleExecution; + QSet<QUmlActivityNode *> _node; + QSet<QUmlActivityPartition *> _partition; + QSet<QUmlStructuredActivityNode *> _structuredNode; + QSet<QUmlVariable *> _variable; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactivity_p.h b/src/uml/qumlactivity_p.h deleted file mode 100644 index 7ba541eb..00000000 --- a/src/uml/qumlactivity_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIVITY_P_H -#define QUMLACTIVITY_P_H - -#include "QtUml/QUmlActivity" - -#include "private/qumlbehavior_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActivityPrivate : public QUmlBehaviorPrivate -{ -public: - QUmlActivityPrivate(); - - QSet<QUmlActivityEdge *> edge; - QSet<QUmlActivityGroup *> group; - bool isReadOnly; - bool isSingleExecution; - QSet<QUmlActivityNode *> node; - QSet<QUmlActivityPartition *> partition; - QSet<QUmlStructuredActivityNode *> structuredNode; - QSet<QUmlVariable *> variable; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIVITY_P_H - diff --git a/src/uml/qumlactivityedge.cpp b/src/uml/qumlactivityedge.cpp index bddb1663..aa1a0c07 100644 --- a/src/uml/qumlactivityedge.cpp +++ b/src/uml/qumlactivityedge.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlactivityedge.h" -#include "qumlactivityedge_p.h" #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityGroup> @@ -51,17 +50,6 @@ QT_BEGIN_NAMESPACE -QUmlActivityEdgePrivate::QUmlActivityEdgePrivate() : - activity(0), - guard(0), - inStructuredNode(0), - interrupts(0), - source(0), - target(0), - weight(0) -{ -} - /*! \class QUmlActivityEdge @@ -70,11 +58,15 @@ QUmlActivityEdgePrivate::QUmlActivityEdgePrivate() : \brief Activity edges can be contained in interruptible regions.An activity edge is an abstract class for directed connections between two activity nodes. */ -QUmlActivityEdge::QUmlActivityEdge(bool create_d_ptr) : - QUmlRedefinableElement(false) +QUmlActivityEdge::QUmlActivityEdge() : + _activity(0), + _guard(0), + _inStructuredNode(0), + _interrupts(0), + _source(0), + _target(0), + _weight(0) { - if (create_d_ptr) - set_d_ptr(new QUmlActivityEdgePrivate); } // OWNED ATTRIBUTES @@ -86,17 +78,15 @@ QUmlActivity *QUmlActivityEdge::activity() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->activity; + return _activity; } void QUmlActivityEdge::setActivity(QUmlActivity *activity) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->activity != activity) { - d->activity = activity; + if (_activity != activity) { + _activity = activity; } } @@ -107,17 +97,15 @@ QUmlValueSpecification *QUmlActivityEdge::guard() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->guard; + return _guard; } void QUmlActivityEdge::setGuard(QUmlValueSpecification *guard) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->guard != guard) { - d->guard = guard; + if (_guard != guard) { + _guard = guard; } } @@ -128,8 +116,7 @@ QSet<QUmlActivityGroup *> QUmlActivityEdge::inGroup() const { // This is a read-only derived union association end - QM_D(const QUmlActivityEdge); - return d->inGroup; + return _inGroup; } /*! @@ -139,17 +126,15 @@ QSet<QUmlActivityPartition *> QUmlActivityEdge::inPartition() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->inPartition; + return _inPartition; } void QUmlActivityEdge::addInPartition(QUmlActivityPartition *inPartition) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (!d->inPartition.contains(inPartition)) { - d->inPartition.insert(inPartition); + if (!_inPartition.contains(inPartition)) { + _inPartition.insert(inPartition); } } @@ -157,9 +142,8 @@ void QUmlActivityEdge::removeInPartition(QUmlActivityPartition *inPartition) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->inPartition.contains(inPartition)) { - d->inPartition.remove(inPartition); + if (_inPartition.contains(inPartition)) { + _inPartition.remove(inPartition); } } @@ -170,17 +154,15 @@ QUmlStructuredActivityNode *QUmlActivityEdge::inStructuredNode() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->inStructuredNode; + return _inStructuredNode; } void QUmlActivityEdge::setInStructuredNode(QUmlStructuredActivityNode *inStructuredNode) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->inStructuredNode != inStructuredNode) { - d->inStructuredNode = inStructuredNode; + if (_inStructuredNode != inStructuredNode) { + _inStructuredNode = inStructuredNode; } } @@ -191,17 +173,15 @@ QUmlInterruptibleActivityRegion *QUmlActivityEdge::interrupts() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->interrupts; + return _interrupts; } void QUmlActivityEdge::setInterrupts(QUmlInterruptibleActivityRegion *interrupts) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->interrupts != interrupts) { - d->interrupts = interrupts; + if (_interrupts != interrupts) { + _interrupts = interrupts; } } @@ -212,17 +192,15 @@ QSet<QUmlActivityEdge *> QUmlActivityEdge::redefinedEdge() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->redefinedEdge; + return _redefinedEdge; } void QUmlActivityEdge::addRedefinedEdge(QUmlActivityEdge *redefinedEdge) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (!d->redefinedEdge.contains(redefinedEdge)) { - d->redefinedEdge.insert(redefinedEdge); + if (!_redefinedEdge.contains(redefinedEdge)) { + _redefinedEdge.insert(redefinedEdge); } } @@ -230,9 +208,8 @@ void QUmlActivityEdge::removeRedefinedEdge(QUmlActivityEdge *redefinedEdge) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->redefinedEdge.contains(redefinedEdge)) { - d->redefinedEdge.remove(redefinedEdge); + if (_redefinedEdge.contains(redefinedEdge)) { + _redefinedEdge.remove(redefinedEdge); } } @@ -243,17 +220,15 @@ QUmlActivityNode *QUmlActivityEdge::source() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->source; + return _source; } void QUmlActivityEdge::setSource(QUmlActivityNode *source) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->source != source) { - d->source = source; + if (_source != source) { + _source = source; } } @@ -264,17 +239,15 @@ QUmlActivityNode *QUmlActivityEdge::target() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->target; + return _target; } void QUmlActivityEdge::setTarget(QUmlActivityNode *target) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->target != target) { - d->target = target; + if (_target != target) { + _target = target; } } @@ -285,17 +258,15 @@ QUmlValueSpecification *QUmlActivityEdge::weight() const { // This is a read-write association end - QM_D(const QUmlActivityEdge); - return d->weight; + return _weight; } void QUmlActivityEdge::setWeight(QUmlValueSpecification *weight) { // This is a read-write association end - QM_D(QUmlActivityEdge); - if (d->weight != weight) { - d->weight = weight; + if (_weight != weight) { + _weight = weight; } } diff --git a/src/uml/qumlactivityedge.h b/src/uml/qumlactivityedge.h index 392101c6..d4d6f911 100644 --- a/src/uml/qumlactivityedge.h +++ b/src/uml/qumlactivityedge.h @@ -59,11 +59,10 @@ class QUmlInterruptibleActivityRegion; class QUmlStructuredActivityNode; class QUmlValueSpecification; -class QUmlActivityEdgePrivate; class Q_UML_EXPORT QUmlActivityEdge : public QUmlRedefinableElement { public: - Q_DECL_HIDDEN QUmlActivityEdge(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlActivityEdge(); // Owned attributes QUmlActivity *activity() const; @@ -87,6 +86,18 @@ public: void setTarget(QUmlActivityNode *target); QUmlValueSpecification *weight() const; void setWeight(QUmlValueSpecification *weight); + +protected: + QUmlActivity *_activity; + QUmlValueSpecification *_guard; + QSet<QUmlActivityGroup *> _inGroup; + QSet<QUmlActivityPartition *> _inPartition; + QUmlStructuredActivityNode *_inStructuredNode; + QUmlInterruptibleActivityRegion *_interrupts; + QSet<QUmlActivityEdge *> _redefinedEdge; + QUmlActivityNode *_source; + QUmlActivityNode *_target; + QUmlValueSpecification *_weight; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactivityedge_p.h b/src/uml/qumlactivityedge_p.h deleted file mode 100644 index e77998b0..00000000 --- a/src/uml/qumlactivityedge_p.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIVITYEDGE_P_H -#define QUMLACTIVITYEDGE_P_H - -#include "QtUml/QUmlActivityEdge" - -#include "private/qumlredefinableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActivityEdgePrivate : public QUmlRedefinableElementPrivate -{ -public: - QUmlActivityEdgePrivate(); - - QUmlActivity *activity; - QUmlValueSpecification *guard; - QSet<QUmlActivityGroup *> inGroup; - QSet<QUmlActivityPartition *> inPartition; - QUmlStructuredActivityNode *inStructuredNode; - QUmlInterruptibleActivityRegion *interrupts; - QSet<QUmlActivityEdge *> redefinedEdge; - QUmlActivityNode *source; - QUmlActivityNode *target; - QUmlValueSpecification *weight; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIVITYEDGE_P_H - diff --git a/src/uml/qumlactivityfinalnode.cpp b/src/uml/qumlactivityfinalnode.cpp index f0a74d3f..86c06cd5 100644 --- a/src/uml/qumlactivityfinalnode.cpp +++ b/src/uml/qumlactivityfinalnode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlactivityfinalnode.h" -#include "qumlactivityfinalnode_p.h" QT_BEGIN_NAMESPACE -QUmlActivityFinalNodePrivate::QUmlActivityFinalNodePrivate() -{ -} - /*! \class QUmlActivityFinalNode @@ -55,11 +50,8 @@ QUmlActivityFinalNodePrivate::QUmlActivityFinalNodePrivate() \brief An activity final node is a final node that stops all flows in an activity. */ -QUmlActivityFinalNode::QUmlActivityFinalNode(bool create_d_ptr) : - QUmlFinalNode(false) +QUmlActivityFinalNode::QUmlActivityFinalNode() { - if (create_d_ptr) - set_d_ptr(new QUmlActivityFinalNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlactivityfinalnode.h b/src/uml/qumlactivityfinalnode.h index 44db00dd..5f406f53 100644 --- a/src/uml/qumlactivityfinalnode.h +++ b/src/uml/qumlactivityfinalnode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlActivityFinalNodePrivate; class Q_UML_EXPORT QUmlActivityFinalNode : public QUmlFinalNode { public: - QUmlActivityFinalNode(bool create_d_ptr = true); + QUmlActivityFinalNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlactivityfinalnode_p.h b/src/uml/qumlactivityfinalnode_p.h deleted file mode 100644 index bcd526b3..00000000 --- a/src/uml/qumlactivityfinalnode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIVITYFINALNODE_P_H -#define QUMLACTIVITYFINALNODE_P_H - -#include "QtUml/QUmlActivityFinalNode" - -#include "private/qumlfinalnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActivityFinalNodePrivate : public QUmlFinalNodePrivate -{ -public: - QUmlActivityFinalNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIVITYFINALNODE_P_H - diff --git a/src/uml/qumlactivitygroup.cpp b/src/uml/qumlactivitygroup.cpp index 9304679f..6f0293f1 100644 --- a/src/uml/qumlactivitygroup.cpp +++ b/src/uml/qumlactivitygroup.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlactivitygroup.h" -#include "qumlactivitygroup_p.h" #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlActivityGroupPrivate::QUmlActivityGroupPrivate() : - inActivity(0), - superGroup(0) -{ -} - /*! \class QUmlActivityGroup @@ -61,11 +54,10 @@ QUmlActivityGroupPrivate::QUmlActivityGroupPrivate() : \brief ActivityGroup is an abstract class for defining sets of nodes and edges in an activity. */ -QUmlActivityGroup::QUmlActivityGroup(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlActivityGroup::QUmlActivityGroup() : + _inActivity(0), + _superGroup(0) { - if (create_d_ptr) - set_d_ptr(new QUmlActivityGroupPrivate); } // OWNED ATTRIBUTES @@ -77,8 +69,7 @@ QSet<QUmlActivityEdge *> QUmlActivityGroup::containedEdge() const { // This is a read-only derived union association end - QM_D(const QUmlActivityGroup); - return d->containedEdge; + return _containedEdge; } /*! @@ -88,8 +79,7 @@ QSet<QUmlActivityNode *> QUmlActivityGroup::containedNode() const { // This is a read-only derived union association end - QM_D(const QUmlActivityGroup); - return d->containedNode; + return _containedNode; } /*! @@ -99,17 +89,15 @@ QUmlActivity *QUmlActivityGroup::inActivity() const { // This is a read-write association end - QM_D(const QUmlActivityGroup); - return d->inActivity; + return _inActivity; } void QUmlActivityGroup::setInActivity(QUmlActivity *inActivity) { // This is a read-write association end - QM_D(QUmlActivityGroup); - if (d->inActivity != inActivity) { - d->inActivity = inActivity; + if (_inActivity != inActivity) { + _inActivity = inActivity; } } @@ -120,8 +108,7 @@ QSet<QUmlActivityGroup *> QUmlActivityGroup::subgroup() const { // This is a read-only derived union association end - QM_D(const QUmlActivityGroup); - return d->subgroup; + return _subgroup; } /*! @@ -131,8 +118,7 @@ QUmlActivityGroup *QUmlActivityGroup::superGroup() const { // This is a read-only derived union association end - QM_D(const QUmlActivityGroup); - return d->superGroup; + return _superGroup; } QT_END_NAMESPACE diff --git a/src/uml/qumlactivitygroup.h b/src/uml/qumlactivitygroup.h index f61520e8..8fdcde7d 100644 --- a/src/uml/qumlactivitygroup.h +++ b/src/uml/qumlactivitygroup.h @@ -55,11 +55,10 @@ class QUmlActivity; class QUmlActivityEdge; class QUmlActivityNode; -class QUmlActivityGroupPrivate; class Q_UML_EXPORT QUmlActivityGroup : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlActivityGroup(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlActivityGroup(); // Owned attributes QSet<QUmlActivityEdge *> containedEdge() const; @@ -68,6 +67,13 @@ public: void setInActivity(QUmlActivity *inActivity); QSet<QUmlActivityGroup *> subgroup() const; QUmlActivityGroup *superGroup() const; + +protected: + QSet<QUmlActivityEdge *> _containedEdge; + QSet<QUmlActivityNode *> _containedNode; + QUmlActivity *_inActivity; + QSet<QUmlActivityGroup *> _subgroup; + QUmlActivityGroup *_superGroup; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactivitygroup_p.h b/src/uml/qumlactivitygroup_p.h deleted file mode 100644 index f23354b8..00000000 --- a/src/uml/qumlactivitygroup_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIVITYGROUP_P_H -#define QUMLACTIVITYGROUP_P_H - -#include "QtUml/QUmlActivityGroup" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActivityGroupPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlActivityGroupPrivate(); - - QSet<QUmlActivityEdge *> containedEdge; - QSet<QUmlActivityNode *> containedNode; - QUmlActivity *inActivity; - QSet<QUmlActivityGroup *> subgroup; - QUmlActivityGroup *superGroup; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIVITYGROUP_P_H - diff --git a/src/uml/qumlactivitynode.cpp b/src/uml/qumlactivitynode.cpp index f3c34338..954270b0 100644 --- a/src/uml/qumlactivitynode.cpp +++ b/src/uml/qumlactivitynode.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlactivitynode.h" -#include "qumlactivitynode_p.h" #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> @@ -50,12 +49,6 @@ QT_BEGIN_NAMESPACE -QUmlActivityNodePrivate::QUmlActivityNodePrivate() : - activity(0), - inStructuredNode(0) -{ -} - /*! \class QUmlActivityNode @@ -64,11 +57,10 @@ QUmlActivityNodePrivate::QUmlActivityNodePrivate() : \brief ActivityNode is an abstract class for points in the flow of an activity connected by edges. */ -QUmlActivityNode::QUmlActivityNode(bool create_d_ptr) : - QUmlRedefinableElement(false) +QUmlActivityNode::QUmlActivityNode() : + _activity(0), + _inStructuredNode(0) { - if (create_d_ptr) - set_d_ptr(new QUmlActivityNodePrivate); } // OWNED ATTRIBUTES @@ -80,17 +72,15 @@ QUmlActivity *QUmlActivityNode::activity() const { // This is a read-write association end - QM_D(const QUmlActivityNode); - return d->activity; + return _activity; } void QUmlActivityNode::setActivity(QUmlActivity *activity) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (d->activity != activity) { - d->activity = activity; + if (_activity != activity) { + _activity = activity; } } @@ -101,8 +91,7 @@ QSet<QUmlActivityGroup *> QUmlActivityNode::inGroup() const { // This is a read-only derived union association end - QM_D(const QUmlActivityNode); - return d->inGroup; + return _inGroup; } /*! @@ -112,17 +101,15 @@ QSet<QUmlInterruptibleActivityRegion *> QUmlActivityNode::inInterruptibleRegion( { // This is a read-write association end - QM_D(const QUmlActivityNode); - return d->inInterruptibleRegion; + return _inInterruptibleRegion; } void QUmlActivityNode::addInInterruptibleRegion(QUmlInterruptibleActivityRegion *inInterruptibleRegion) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (!d->inInterruptibleRegion.contains(inInterruptibleRegion)) { - d->inInterruptibleRegion.insert(inInterruptibleRegion); + if (!_inInterruptibleRegion.contains(inInterruptibleRegion)) { + _inInterruptibleRegion.insert(inInterruptibleRegion); } } @@ -130,9 +117,8 @@ void QUmlActivityNode::removeInInterruptibleRegion(QUmlInterruptibleActivityRegi { // This is a read-write association end - QM_D(QUmlActivityNode); - if (d->inInterruptibleRegion.contains(inInterruptibleRegion)) { - d->inInterruptibleRegion.remove(inInterruptibleRegion); + if (_inInterruptibleRegion.contains(inInterruptibleRegion)) { + _inInterruptibleRegion.remove(inInterruptibleRegion); } } @@ -143,17 +129,15 @@ QSet<QUmlActivityPartition *> QUmlActivityNode::inPartition() const { // This is a read-write association end - QM_D(const QUmlActivityNode); - return d->inPartition; + return _inPartition; } void QUmlActivityNode::addInPartition(QUmlActivityPartition *inPartition) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (!d->inPartition.contains(inPartition)) { - d->inPartition.insert(inPartition); + if (!_inPartition.contains(inPartition)) { + _inPartition.insert(inPartition); } } @@ -161,9 +145,8 @@ void QUmlActivityNode::removeInPartition(QUmlActivityPartition *inPartition) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (d->inPartition.contains(inPartition)) { - d->inPartition.remove(inPartition); + if (_inPartition.contains(inPartition)) { + _inPartition.remove(inPartition); } } @@ -174,17 +157,15 @@ QUmlStructuredActivityNode *QUmlActivityNode::inStructuredNode() const { // This is a read-write association end - QM_D(const QUmlActivityNode); - return d->inStructuredNode; + return _inStructuredNode; } void QUmlActivityNode::setInStructuredNode(QUmlStructuredActivityNode *inStructuredNode) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (d->inStructuredNode != inStructuredNode) { - d->inStructuredNode = inStructuredNode; + if (_inStructuredNode != inStructuredNode) { + _inStructuredNode = inStructuredNode; } } @@ -195,17 +176,15 @@ QSet<QUmlActivityEdge *> QUmlActivityNode::incoming() const { // This is a read-write association end - QM_D(const QUmlActivityNode); - return d->incoming; + return _incoming; } void QUmlActivityNode::addIncoming(QUmlActivityEdge *incoming) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (!d->incoming.contains(incoming)) { - d->incoming.insert(incoming); + if (!_incoming.contains(incoming)) { + _incoming.insert(incoming); } } @@ -213,9 +192,8 @@ void QUmlActivityNode::removeIncoming(QUmlActivityEdge *incoming) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (d->incoming.contains(incoming)) { - d->incoming.remove(incoming); + if (_incoming.contains(incoming)) { + _incoming.remove(incoming); } } @@ -226,17 +204,15 @@ QSet<QUmlActivityEdge *> QUmlActivityNode::outgoing() const { // This is a read-write association end - QM_D(const QUmlActivityNode); - return d->outgoing; + return _outgoing; } void QUmlActivityNode::addOutgoing(QUmlActivityEdge *outgoing) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (!d->outgoing.contains(outgoing)) { - d->outgoing.insert(outgoing); + if (!_outgoing.contains(outgoing)) { + _outgoing.insert(outgoing); } } @@ -244,9 +220,8 @@ void QUmlActivityNode::removeOutgoing(QUmlActivityEdge *outgoing) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (d->outgoing.contains(outgoing)) { - d->outgoing.remove(outgoing); + if (_outgoing.contains(outgoing)) { + _outgoing.remove(outgoing); } } @@ -257,17 +232,15 @@ QSet<QUmlActivityNode *> QUmlActivityNode::redefinedNode() const { // This is a read-write association end - QM_D(const QUmlActivityNode); - return d->redefinedNode; + return _redefinedNode; } void QUmlActivityNode::addRedefinedNode(QUmlActivityNode *redefinedNode) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (!d->redefinedNode.contains(redefinedNode)) { - d->redefinedNode.insert(redefinedNode); + if (!_redefinedNode.contains(redefinedNode)) { + _redefinedNode.insert(redefinedNode); } } @@ -275,9 +248,8 @@ void QUmlActivityNode::removeRedefinedNode(QUmlActivityNode *redefinedNode) { // This is a read-write association end - QM_D(QUmlActivityNode); - if (d->redefinedNode.contains(redefinedNode)) { - d->redefinedNode.remove(redefinedNode); + if (_redefinedNode.contains(redefinedNode)) { + _redefinedNode.remove(redefinedNode); } } diff --git a/src/uml/qumlactivitynode.h b/src/uml/qumlactivitynode.h index 3b0741ba..ef839e6c 100644 --- a/src/uml/qumlactivitynode.h +++ b/src/uml/qumlactivitynode.h @@ -58,11 +58,10 @@ class QUmlActivityPartition; class QUmlInterruptibleActivityRegion; class QUmlStructuredActivityNode; -class QUmlActivityNodePrivate; class Q_UML_EXPORT QUmlActivityNode : public QUmlRedefinableElement { public: - Q_DECL_HIDDEN QUmlActivityNode(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlActivityNode(); // Owned attributes QUmlActivity *activity() const; @@ -85,6 +84,16 @@ public: QSet<QUmlActivityNode *> redefinedNode() const; void addRedefinedNode(QUmlActivityNode *redefinedNode); void removeRedefinedNode(QUmlActivityNode *redefinedNode); + +protected: + QUmlActivity *_activity; + QSet<QUmlActivityGroup *> _inGroup; + QSet<QUmlInterruptibleActivityRegion *> _inInterruptibleRegion; + QSet<QUmlActivityPartition *> _inPartition; + QUmlStructuredActivityNode *_inStructuredNode; + QSet<QUmlActivityEdge *> _incoming; + QSet<QUmlActivityEdge *> _outgoing; + QSet<QUmlActivityNode *> _redefinedNode; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactivitynode_p.h b/src/uml/qumlactivitynode_p.h deleted file mode 100644 index 22fe4950..00000000 --- a/src/uml/qumlactivitynode_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIVITYNODE_P_H -#define QUMLACTIVITYNODE_P_H - -#include "QtUml/QUmlActivityNode" - -#include "private/qumlredefinableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActivityNodePrivate : public QUmlRedefinableElementPrivate -{ -public: - QUmlActivityNodePrivate(); - - QUmlActivity *activity; - QSet<QUmlActivityGroup *> inGroup; - QSet<QUmlInterruptibleActivityRegion *> inInterruptibleRegion; - QSet<QUmlActivityPartition *> inPartition; - QUmlStructuredActivityNode *inStructuredNode; - QSet<QUmlActivityEdge *> incoming; - QSet<QUmlActivityEdge *> outgoing; - QSet<QUmlActivityNode *> redefinedNode; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIVITYNODE_P_H - diff --git a/src/uml/qumlactivityparameternode.cpp b/src/uml/qumlactivityparameternode.cpp index ee3a6e73..5b96cd60 100644 --- a/src/uml/qumlactivityparameternode.cpp +++ b/src/uml/qumlactivityparameternode.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlactivityparameternode.h" -#include "qumlactivityparameternode_p.h" #include <QtUml/QUmlParameter> QT_BEGIN_NAMESPACE -QUmlActivityParameterNodePrivate::QUmlActivityParameterNodePrivate() : - parameter(0) -{ -} - /*! \class QUmlActivityParameterNode @@ -58,11 +52,9 @@ QUmlActivityParameterNodePrivate::QUmlActivityParameterNodePrivate() : \brief An activity parameter node is an object node for inputs and outputs to activities. */ -QUmlActivityParameterNode::QUmlActivityParameterNode(bool create_d_ptr) : - QUmlObjectNode(false) +QUmlActivityParameterNode::QUmlActivityParameterNode() : + _parameter(0) { - if (create_d_ptr) - set_d_ptr(new QUmlActivityParameterNodePrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlParameter *QUmlActivityParameterNode::parameter() const { // This is a read-write association end - QM_D(const QUmlActivityParameterNode); - return d->parameter; + return _parameter; } void QUmlActivityParameterNode::setParameter(QUmlParameter *parameter) { // This is a read-write association end - QM_D(QUmlActivityParameterNode); - if (d->parameter != parameter) { - d->parameter = parameter; + if (_parameter != parameter) { + _parameter = parameter; } } diff --git a/src/uml/qumlactivityparameternode.h b/src/uml/qumlactivityparameternode.h index 70966c90..a760bbb3 100644 --- a/src/uml/qumlactivityparameternode.h +++ b/src/uml/qumlactivityparameternode.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlParameter; -class QUmlActivityParameterNodePrivate; class Q_UML_EXPORT QUmlActivityParameterNode : public QUmlObjectNode { public: - QUmlActivityParameterNode(bool create_d_ptr = true); + QUmlActivityParameterNode(); // Owned attributes QUmlParameter *parameter() const; void setParameter(QUmlParameter *parameter); + +protected: + QUmlParameter *_parameter; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactivityparameternode_p.h b/src/uml/qumlactivityparameternode_p.h deleted file mode 100644 index f75da396..00000000 --- a/src/uml/qumlactivityparameternode_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIVITYPARAMETERNODE_P_H -#define QUMLACTIVITYPARAMETERNODE_P_H - -#include "QtUml/QUmlActivityParameterNode" - -#include "private/qumlobjectnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActivityParameterNodePrivate : public QUmlObjectNodePrivate -{ -public: - QUmlActivityParameterNodePrivate(); - - QUmlParameter *parameter; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIVITYPARAMETERNODE_P_H - diff --git a/src/uml/qumlactivitypartition.cpp b/src/uml/qumlactivitypartition.cpp index 177df411..8cc2e060 100644 --- a/src/uml/qumlactivitypartition.cpp +++ b/src/uml/qumlactivitypartition.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlactivitypartition.h" -#include "qumlactivitypartition_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityNode> @@ -47,14 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlActivityPartitionPrivate::QUmlActivityPartitionPrivate() : - isDimension(false), - isExternal(false), - represents(0), - superPartition(0) -{ -} - /*! \class QUmlActivityPartition @@ -63,11 +54,12 @@ QUmlActivityPartitionPrivate::QUmlActivityPartitionPrivate() : \brief An activity partition is a kind of activity group for identifying actions that have some characteristic in common. */ -QUmlActivityPartition::QUmlActivityPartition(bool create_d_ptr) : - QUmlActivityGroup(false) +QUmlActivityPartition::QUmlActivityPartition() : + _isDimension(false), + _isExternal(false), + _represents(0), + _superPartition(0) { - if (create_d_ptr) - set_d_ptr(new QUmlActivityPartitionPrivate); } // OWNED ATTRIBUTES @@ -79,17 +71,15 @@ QSet<QUmlActivityEdge *> QUmlActivityPartition::edge() const { // This is a read-write association end - QM_D(const QUmlActivityPartition); - return d->edge; + return _edge; } void QUmlActivityPartition::addEdge(QUmlActivityEdge *edge) { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (!d->edge.contains(edge)) { - d->edge.insert(edge); + if (!_edge.contains(edge)) { + _edge.insert(edge); } } @@ -97,9 +87,8 @@ void QUmlActivityPartition::removeEdge(QUmlActivityEdge *edge) { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (d->edge.contains(edge)) { - d->edge.remove(edge); + if (_edge.contains(edge)) { + _edge.remove(edge); } } @@ -110,17 +99,15 @@ bool QUmlActivityPartition::isDimension() const { // This is a read-write property - QM_D(const QUmlActivityPartition); - return d->isDimension; + return _isDimension; } void QUmlActivityPartition::setDimension(bool isDimension) { // This is a read-write property - QM_D(QUmlActivityPartition); - if (d->isDimension != isDimension) { - d->isDimension = isDimension; + if (_isDimension != isDimension) { + _isDimension = isDimension; } } @@ -131,17 +118,15 @@ bool QUmlActivityPartition::isExternal() const { // This is a read-write property - QM_D(const QUmlActivityPartition); - return d->isExternal; + return _isExternal; } void QUmlActivityPartition::setExternal(bool isExternal) { // This is a read-write property - QM_D(QUmlActivityPartition); - if (d->isExternal != isExternal) { - d->isExternal = isExternal; + if (_isExternal != isExternal) { + _isExternal = isExternal; } } @@ -152,17 +137,15 @@ QSet<QUmlActivityNode *> QUmlActivityPartition::node() const { // This is a read-write association end - QM_D(const QUmlActivityPartition); - return d->node; + return _node; } void QUmlActivityPartition::addNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (!d->node.contains(node)) { - d->node.insert(node); + if (!_node.contains(node)) { + _node.insert(node); } } @@ -170,9 +153,8 @@ void QUmlActivityPartition::removeNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (d->node.contains(node)) { - d->node.remove(node); + if (_node.contains(node)) { + _node.remove(node); } } @@ -183,17 +165,15 @@ QUmlElement *QUmlActivityPartition::represents() const { // This is a read-write association end - QM_D(const QUmlActivityPartition); - return d->represents; + return _represents; } void QUmlActivityPartition::setRepresents(QUmlElement *represents) { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (d->represents != represents) { - d->represents = represents; + if (_represents != represents) { + _represents = represents; } } @@ -204,17 +184,15 @@ QSet<QUmlActivityPartition *> QUmlActivityPartition::subpartition() const { // This is a read-write association end - QM_D(const QUmlActivityPartition); - return d->subpartition; + return _subpartition; } void QUmlActivityPartition::addSubpartition(QUmlActivityPartition *subpartition) { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (!d->subpartition.contains(subpartition)) { - d->subpartition.insert(subpartition); + if (!_subpartition.contains(subpartition)) { + _subpartition.insert(subpartition); } } @@ -222,9 +200,8 @@ void QUmlActivityPartition::removeSubpartition(QUmlActivityPartition *subpartiti { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (d->subpartition.contains(subpartition)) { - d->subpartition.remove(subpartition); + if (_subpartition.contains(subpartition)) { + _subpartition.remove(subpartition); } } @@ -235,17 +212,15 @@ QUmlActivityPartition *QUmlActivityPartition::superPartition() const { // This is a read-write association end - QM_D(const QUmlActivityPartition); - return d->superPartition; + return _superPartition; } void QUmlActivityPartition::setSuperPartition(QUmlActivityPartition *superPartition) { // This is a read-write association end - QM_D(QUmlActivityPartition); - if (d->superPartition != superPartition) { - d->superPartition = superPartition; + if (_superPartition != superPartition) { + _superPartition = superPartition; } } diff --git a/src/uml/qumlactivitypartition.h b/src/uml/qumlactivitypartition.h index cf743ee0..2381ac1e 100644 --- a/src/uml/qumlactivitypartition.h +++ b/src/uml/qumlactivitypartition.h @@ -55,11 +55,10 @@ class QUmlActivityEdge; class QUmlActivityNode; class QUmlElement; -class QUmlActivityPartitionPrivate; class Q_UML_EXPORT QUmlActivityPartition : public QUmlActivityGroup { public: - QUmlActivityPartition(bool create_d_ptr = true); + QUmlActivityPartition(); // Owned attributes QSet<QUmlActivityEdge *> edge() const; @@ -79,6 +78,15 @@ public: void removeSubpartition(QUmlActivityPartition *subpartition); QUmlActivityPartition *superPartition() const; void setSuperPartition(QUmlActivityPartition *superPartition); + +protected: + QSet<QUmlActivityEdge *> _edge; + bool _isDimension; + bool _isExternal; + QSet<QUmlActivityNode *> _node; + QUmlElement *_represents; + QSet<QUmlActivityPartition *> _subpartition; + QUmlActivityPartition *_superPartition; }; QT_END_NAMESPACE diff --git a/src/uml/qumlactivitypartition_p.h b/src/uml/qumlactivitypartition_p.h deleted file mode 100644 index 810a7952..00000000 --- a/src/uml/qumlactivitypartition_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTIVITYPARTITION_P_H -#define QUMLACTIVITYPARTITION_P_H - -#include "QtUml/QUmlActivityPartition" - -#include "private/qumlactivitygroup_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActivityPartitionPrivate : public QUmlActivityGroupPrivate -{ -public: - QUmlActivityPartitionPrivate(); - - QSet<QUmlActivityEdge *> edge; - bool isDimension; - bool isExternal; - QSet<QUmlActivityNode *> node; - QUmlElement *represents; - QSet<QUmlActivityPartition *> subpartition; - QUmlActivityPartition *superPartition; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTIVITYPARTITION_P_H - diff --git a/src/uml/qumlactor.cpp b/src/uml/qumlactor.cpp index 9458b857..02982a93 100644 --- a/src/uml/qumlactor.cpp +++ b/src/uml/qumlactor.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlactor.h" -#include "qumlactor_p.h" QT_BEGIN_NAMESPACE -QUmlActorPrivate::QUmlActorPrivate() -{ -} - /*! \class QUmlActor @@ -55,11 +50,8 @@ QUmlActorPrivate::QUmlActorPrivate() \brief An actor specifies a role played by a user or any other system that interacts with the subject. */ -QUmlActor::QUmlActor(bool create_d_ptr) : - QUmlBehavioredClassifier(false) +QUmlActor::QUmlActor() { - if (create_d_ptr) - set_d_ptr(new QUmlActorPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlactor.h b/src/uml/qumlactor.h index bb17e799..7bbd17c2 100644 --- a/src/uml/qumlactor.h +++ b/src/uml/qumlactor.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlActorPrivate; class Q_UML_EXPORT QUmlActor : public QUmlBehavioredClassifier { public: - QUmlActor(bool create_d_ptr = true); + QUmlActor(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlactor_p.h b/src/uml/qumlactor_p.h deleted file mode 100644 index f7cdf6f6..00000000 --- a/src/uml/qumlactor_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLACTOR_P_H -#define QUMLACTOR_P_H - -#include "QtUml/QUmlActor" - -#include "private/qumlbehavioredclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlActorPrivate : public QUmlBehavioredClassifierPrivate -{ -public: - QUmlActorPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLACTOR_P_H - diff --git a/src/uml/qumladdstructuralfeaturevalueaction.cpp b/src/uml/qumladdstructuralfeaturevalueaction.cpp index 488ebf52..3e9bd42e 100644 --- a/src/uml/qumladdstructuralfeaturevalueaction.cpp +++ b/src/uml/qumladdstructuralfeaturevalueaction.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumladdstructuralfeaturevalueaction.h" -#include "qumladdstructuralfeaturevalueaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlAddStructuralFeatureValueActionPrivate::QUmlAddStructuralFeatureValueActionPrivate() : - insertAt(0), - isReplaceAll(false) -{ -} - /*! \class QUmlAddStructuralFeatureValueAction @@ -59,11 +52,10 @@ QUmlAddStructuralFeatureValueActionPrivate::QUmlAddStructuralFeatureValueActionP \brief An add structural feature value action is a write structural feature action for adding values to a structural feature. */ -QUmlAddStructuralFeatureValueAction::QUmlAddStructuralFeatureValueAction(bool create_d_ptr) : - QUmlWriteStructuralFeatureAction(false) +QUmlAddStructuralFeatureValueAction::QUmlAddStructuralFeatureValueAction() : + _insertAt(0), + _isReplaceAll(false) { - if (create_d_ptr) - set_d_ptr(new QUmlAddStructuralFeatureValueActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlInputPin *QUmlAddStructuralFeatureValueAction::insertAt() const { // This is a read-write association end - QM_D(const QUmlAddStructuralFeatureValueAction); - return d->insertAt; + return _insertAt; } void QUmlAddStructuralFeatureValueAction::setInsertAt(QUmlInputPin *insertAt) { // This is a read-write association end - QM_D(QUmlAddStructuralFeatureValueAction); - if (d->insertAt != insertAt) { - d->insertAt = insertAt; + if (_insertAt != insertAt) { + _insertAt = insertAt; } } @@ -96,17 +86,15 @@ bool QUmlAddStructuralFeatureValueAction::isReplaceAll() const { // This is a read-write property - QM_D(const QUmlAddStructuralFeatureValueAction); - return d->isReplaceAll; + return _isReplaceAll; } void QUmlAddStructuralFeatureValueAction::setReplaceAll(bool isReplaceAll) { // This is a read-write property - QM_D(QUmlAddStructuralFeatureValueAction); - if (d->isReplaceAll != isReplaceAll) { - d->isReplaceAll = isReplaceAll; + if (_isReplaceAll != isReplaceAll) { + _isReplaceAll = isReplaceAll; } } diff --git a/src/uml/qumladdstructuralfeaturevalueaction.h b/src/uml/qumladdstructuralfeaturevalueaction.h index 914ccfe6..0d4d380b 100644 --- a/src/uml/qumladdstructuralfeaturevalueaction.h +++ b/src/uml/qumladdstructuralfeaturevalueaction.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlAddStructuralFeatureValueActionPrivate; class Q_UML_EXPORT QUmlAddStructuralFeatureValueAction : public QUmlWriteStructuralFeatureAction { public: - QUmlAddStructuralFeatureValueAction(bool create_d_ptr = true); + QUmlAddStructuralFeatureValueAction(); // Owned attributes QUmlInputPin *insertAt() const; void setInsertAt(QUmlInputPin *insertAt); bool isReplaceAll() const; void setReplaceAll(bool isReplaceAll); + +protected: + QUmlInputPin *_insertAt; + bool _isReplaceAll; }; QT_END_NAMESPACE diff --git a/src/uml/qumladdstructuralfeaturevalueaction_p.h b/src/uml/qumladdstructuralfeaturevalueaction_p.h deleted file mode 100644 index 61d69753..00000000 --- a/src/uml/qumladdstructuralfeaturevalueaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLADDSTRUCTURALFEATUREVALUEACTION_P_H -#define QUMLADDSTRUCTURALFEATUREVALUEACTION_P_H - -#include "QtUml/QUmlAddStructuralFeatureValueAction" - -#include "private/qumlwritestructuralfeatureaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAddStructuralFeatureValueActionPrivate : public QUmlWriteStructuralFeatureActionPrivate -{ -public: - QUmlAddStructuralFeatureValueActionPrivate(); - - QUmlInputPin *insertAt; - bool isReplaceAll; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLADDSTRUCTURALFEATUREVALUEACTION_P_H - diff --git a/src/uml/qumladdvariablevalueaction.cpp b/src/uml/qumladdvariablevalueaction.cpp index ab85dd3d..b3951656 100644 --- a/src/uml/qumladdvariablevalueaction.cpp +++ b/src/uml/qumladdvariablevalueaction.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumladdvariablevalueaction.h" -#include "qumladdvariablevalueaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlAddVariableValueActionPrivate::QUmlAddVariableValueActionPrivate() : - insertAt(0), - isReplaceAll(false) -{ -} - /*! \class QUmlAddVariableValueAction @@ -59,11 +52,10 @@ QUmlAddVariableValueActionPrivate::QUmlAddVariableValueActionPrivate() : \brief An add variable value action is a write variable action for adding values to a variable. */ -QUmlAddVariableValueAction::QUmlAddVariableValueAction(bool create_d_ptr) : - QUmlWriteVariableAction(false) +QUmlAddVariableValueAction::QUmlAddVariableValueAction() : + _insertAt(0), + _isReplaceAll(false) { - if (create_d_ptr) - set_d_ptr(new QUmlAddVariableValueActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlInputPin *QUmlAddVariableValueAction::insertAt() const { // This is a read-write association end - QM_D(const QUmlAddVariableValueAction); - return d->insertAt; + return _insertAt; } void QUmlAddVariableValueAction::setInsertAt(QUmlInputPin *insertAt) { // This is a read-write association end - QM_D(QUmlAddVariableValueAction); - if (d->insertAt != insertAt) { - d->insertAt = insertAt; + if (_insertAt != insertAt) { + _insertAt = insertAt; } } @@ -96,17 +86,15 @@ bool QUmlAddVariableValueAction::isReplaceAll() const { // This is a read-write property - QM_D(const QUmlAddVariableValueAction); - return d->isReplaceAll; + return _isReplaceAll; } void QUmlAddVariableValueAction::setReplaceAll(bool isReplaceAll) { // This is a read-write property - QM_D(QUmlAddVariableValueAction); - if (d->isReplaceAll != isReplaceAll) { - d->isReplaceAll = isReplaceAll; + if (_isReplaceAll != isReplaceAll) { + _isReplaceAll = isReplaceAll; } } diff --git a/src/uml/qumladdvariablevalueaction.h b/src/uml/qumladdvariablevalueaction.h index b0130984..b091df09 100644 --- a/src/uml/qumladdvariablevalueaction.h +++ b/src/uml/qumladdvariablevalueaction.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlAddVariableValueActionPrivate; class Q_UML_EXPORT QUmlAddVariableValueAction : public QUmlWriteVariableAction { public: - QUmlAddVariableValueAction(bool create_d_ptr = true); + QUmlAddVariableValueAction(); // Owned attributes QUmlInputPin *insertAt() const; void setInsertAt(QUmlInputPin *insertAt); bool isReplaceAll() const; void setReplaceAll(bool isReplaceAll); + +protected: + QUmlInputPin *_insertAt; + bool _isReplaceAll; }; QT_END_NAMESPACE diff --git a/src/uml/qumladdvariablevalueaction_p.h b/src/uml/qumladdvariablevalueaction_p.h deleted file mode 100644 index a9685266..00000000 --- a/src/uml/qumladdvariablevalueaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLADDVARIABLEVALUEACTION_P_H -#define QUMLADDVARIABLEVALUEACTION_P_H - -#include "QtUml/QUmlAddVariableValueAction" - -#include "private/qumlwritevariableaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAddVariableValueActionPrivate : public QUmlWriteVariableActionPrivate -{ -public: - QUmlAddVariableValueActionPrivate(); - - QUmlInputPin *insertAt; - bool isReplaceAll; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLADDVARIABLEVALUEACTION_P_H - diff --git a/src/uml/qumlanyreceiveevent.cpp b/src/uml/qumlanyreceiveevent.cpp index fc7de491..506a252d 100644 --- a/src/uml/qumlanyreceiveevent.cpp +++ b/src/uml/qumlanyreceiveevent.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlanyreceiveevent.h" -#include "qumlanyreceiveevent_p.h" QT_BEGIN_NAMESPACE -QUmlAnyReceiveEventPrivate::QUmlAnyReceiveEventPrivate() -{ -} - /*! \class QUmlAnyReceiveEvent @@ -55,11 +50,8 @@ QUmlAnyReceiveEventPrivate::QUmlAnyReceiveEventPrivate() \brief A trigger for an AnyReceiveEvent is triggered by the receipt of any message that is not explicitly handled by any related trigger. */ -QUmlAnyReceiveEvent::QUmlAnyReceiveEvent(bool create_d_ptr) : - QUmlMessageEvent(false) +QUmlAnyReceiveEvent::QUmlAnyReceiveEvent() { - if (create_d_ptr) - set_d_ptr(new QUmlAnyReceiveEventPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlanyreceiveevent.h b/src/uml/qumlanyreceiveevent.h index 88166914..c7c649ec 100644 --- a/src/uml/qumlanyreceiveevent.h +++ b/src/uml/qumlanyreceiveevent.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlAnyReceiveEventPrivate; class Q_UML_EXPORT QUmlAnyReceiveEvent : public QUmlMessageEvent { public: - QUmlAnyReceiveEvent(bool create_d_ptr = true); + QUmlAnyReceiveEvent(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlanyreceiveevent_p.h b/src/uml/qumlanyreceiveevent_p.h deleted file mode 100644 index 61b5455f..00000000 --- a/src/uml/qumlanyreceiveevent_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLANYRECEIVEEVENT_P_H -#define QUMLANYRECEIVEEVENT_P_H - -#include "QtUml/QUmlAnyReceiveEvent" - -#include "private/qumlmessageevent_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAnyReceiveEventPrivate : public QUmlMessageEventPrivate -{ -public: - QUmlAnyReceiveEventPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLANYRECEIVEEVENT_P_H - diff --git a/src/uml/qumlartifact.cpp b/src/uml/qumlartifact.cpp index b8cef169..aeedef3a 100644 --- a/src/uml/qumlartifact.cpp +++ b/src/uml/qumlartifact.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlartifact.h" -#include "qumlartifact_p.h" #include <QtUml/QUmlManifestation> #include <QtUml/QUmlOperation> @@ -47,10 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlArtifactPrivate::QUmlArtifactPrivate() -{ -} - /*! \class QUmlArtifact @@ -59,12 +54,8 @@ QUmlArtifactPrivate::QUmlArtifactPrivate() \brief An artifact is the source of a deployment to a node.An artifact is the specification of a physical piece of information that is used or produced by a software development process, or by deployment and operation of a system. Examples of artifacts include model files, source files, scripts, and binary executable files, a table in a database system, a development deliverable, or a word-processing document, a mail message. */ -QUmlArtifact::QUmlArtifact(bool create_d_ptr) : - QUmlDeployedArtifact(false), - QUmlClassifier(false) +QUmlArtifact::QUmlArtifact() { - if (create_d_ptr) - set_d_ptr(new QUmlArtifactPrivate); } // OWNED ATTRIBUTES @@ -76,17 +67,15 @@ QString QUmlArtifact::fileName() const { // This is a read-write property - QM_D(const QUmlArtifact); - return d->fileName; + return _fileName; } void QUmlArtifact::setFileName(QString fileName) { // This is a read-write property - QM_D(QUmlArtifact); - if (d->fileName != fileName) { - d->fileName = fileName; + if (_fileName != fileName) { + _fileName = fileName; } } @@ -97,17 +86,15 @@ QSet<QUmlManifestation *> QUmlArtifact::manifestation() const { // This is a read-write association end - QM_D(const QUmlArtifact); - return d->manifestation; + return _manifestation; } void QUmlArtifact::addManifestation(QUmlManifestation *manifestation) { // This is a read-write association end - QM_D(QUmlArtifact); - if (!d->manifestation.contains(manifestation)) { - d->manifestation.insert(manifestation); + if (!_manifestation.contains(manifestation)) { + _manifestation.insert(manifestation); } } @@ -115,9 +102,8 @@ void QUmlArtifact::removeManifestation(QUmlManifestation *manifestation) { // This is a read-write association end - QM_D(QUmlArtifact); - if (d->manifestation.contains(manifestation)) { - d->manifestation.remove(manifestation); + if (_manifestation.contains(manifestation)) { + _manifestation.remove(manifestation); } } @@ -128,17 +114,15 @@ QSet<QUmlArtifact *> QUmlArtifact::nestedArtifact() const { // This is a read-write association end - QM_D(const QUmlArtifact); - return d->nestedArtifact; + return _nestedArtifact; } void QUmlArtifact::addNestedArtifact(QUmlArtifact *nestedArtifact) { // This is a read-write association end - QM_D(QUmlArtifact); - if (!d->nestedArtifact.contains(nestedArtifact)) { - d->nestedArtifact.insert(nestedArtifact); + if (!_nestedArtifact.contains(nestedArtifact)) { + _nestedArtifact.insert(nestedArtifact); } } @@ -146,9 +130,8 @@ void QUmlArtifact::removeNestedArtifact(QUmlArtifact *nestedArtifact) { // This is a read-write association end - QM_D(QUmlArtifact); - if (d->nestedArtifact.contains(nestedArtifact)) { - d->nestedArtifact.remove(nestedArtifact); + if (_nestedArtifact.contains(nestedArtifact)) { + _nestedArtifact.remove(nestedArtifact); } } @@ -159,17 +142,15 @@ QList<QUmlProperty *> QUmlArtifact::ownedAttribute() const { // This is a read-write association end - QM_D(const QUmlArtifact); - return d->ownedAttribute; + return _ownedAttribute; } void QUmlArtifact::addOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlArtifact); - if (!d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.append(ownedAttribute); + if (!_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.append(ownedAttribute); } } @@ -177,9 +158,8 @@ void QUmlArtifact::removeOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlArtifact); - if (d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.removeAll(ownedAttribute); + if (_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.removeAll(ownedAttribute); } } @@ -190,17 +170,15 @@ QList<QUmlOperation *> QUmlArtifact::ownedOperation() const { // This is a read-write association end - QM_D(const QUmlArtifact); - return d->ownedOperation; + return _ownedOperation; } void QUmlArtifact::addOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlArtifact); - if (!d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.append(ownedOperation); + if (!_ownedOperation.contains(ownedOperation)) { + _ownedOperation.append(ownedOperation); } } @@ -208,9 +186,8 @@ void QUmlArtifact::removeOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlArtifact); - if (d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.removeAll(ownedOperation); + if (_ownedOperation.contains(ownedOperation)) { + _ownedOperation.removeAll(ownedOperation); } } diff --git a/src/uml/qumlartifact.h b/src/uml/qumlartifact.h index 5656604c..effab1bd 100644 --- a/src/uml/qumlartifact.h +++ b/src/uml/qumlartifact.h @@ -56,11 +56,10 @@ class QUmlManifestation; class QUmlOperation; class QUmlProperty; -class QUmlArtifactPrivate; class Q_UML_EXPORT QUmlArtifact : public QUmlDeployedArtifact, public QUmlClassifier { public: - QUmlArtifact(bool create_d_ptr = true); + QUmlArtifact(); // Owned attributes QString fileName() const; @@ -77,6 +76,13 @@ public: QList<QUmlOperation *> ownedOperation() const; void addOwnedOperation(QUmlOperation *ownedOperation); void removeOwnedOperation(QUmlOperation *ownedOperation); + +protected: + QString _fileName; + QSet<QUmlManifestation *> _manifestation; + QSet<QUmlArtifact *> _nestedArtifact; + QList<QUmlProperty *> _ownedAttribute; + QList<QUmlOperation *> _ownedOperation; }; QT_END_NAMESPACE diff --git a/src/uml/qumlartifact_p.h b/src/uml/qumlartifact_p.h deleted file mode 100644 index d020c95d..00000000 --- a/src/uml/qumlartifact_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLARTIFACT_P_H -#define QUMLARTIFACT_P_H - -#include "QtUml/QUmlArtifact" - -#include "private/qumldeployedartifact_p.h" -#include "private/qumlclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlArtifactPrivate : public QUmlDeployedArtifactPrivate, public QUmlClassifierPrivate -{ -public: - QUmlArtifactPrivate(); - - QString fileName; - QSet<QUmlManifestation *> manifestation; - QSet<QUmlArtifact *> nestedArtifact; - QList<QUmlProperty *> ownedAttribute; - QList<QUmlOperation *> ownedOperation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLARTIFACT_P_H - diff --git a/src/uml/qumlassociation.cpp b/src/uml/qumlassociation.cpp index ee0a39ad..272bb847 100644 --- a/src/uml/qumlassociation.cpp +++ b/src/uml/qumlassociation.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlassociation.h" -#include "qumlassociation_p.h" #include <QtUml/QUmlProperty> #include <QtUml/QUmlType> QT_BEGIN_NAMESPACE -QUmlAssociationPrivate::QUmlAssociationPrivate() : - isDerived(false) -{ -} - /*! \class QUmlAssociation @@ -59,12 +53,9 @@ QUmlAssociationPrivate::QUmlAssociationPrivate() : \brief An association describes a set of tuples whose values refer to typed instances. An instance of an association is called a link.A link is a tuple with one value for each end of the association, where each value is an instance of the type of the end.An association describes a set of tuples whose values refer to typed instances. An instance of an association is called a link. A link is a tuple with one value for each end of the association, where each value is an instance of the type of the end. */ -QUmlAssociation::QUmlAssociation(bool create_d_ptr) : - QUmlClassifier(false), - QUmlRelationship(false) +QUmlAssociation::QUmlAssociation() : + _isDerived(false) { - if (create_d_ptr) - set_d_ptr(new QUmlAssociationPrivate); } // OWNED ATTRIBUTES @@ -88,17 +79,15 @@ bool QUmlAssociation::isDerived() const { // This is a read-write property - QM_D(const QUmlAssociation); - return d->isDerived; + return _isDerived; } void QUmlAssociation::setDerived(bool isDerived) { // This is a read-write property - QM_D(QUmlAssociation); - if (d->isDerived != isDerived) { - d->isDerived = isDerived; + if (_isDerived != isDerived) { + _isDerived = isDerived; } } @@ -109,17 +98,15 @@ QList<QUmlProperty *> QUmlAssociation::memberEnd() const { // This is a read-write association end - QM_D(const QUmlAssociation); - return d->memberEnd; + return _memberEnd; } void QUmlAssociation::addMemberEnd(QUmlProperty *memberEnd) { // This is a read-write association end - QM_D(QUmlAssociation); - if (!d->memberEnd.contains(memberEnd)) { - d->memberEnd.append(memberEnd); + if (!_memberEnd.contains(memberEnd)) { + _memberEnd.append(memberEnd); } } @@ -127,9 +114,8 @@ void QUmlAssociation::removeMemberEnd(QUmlProperty *memberEnd) { // This is a read-write association end - QM_D(QUmlAssociation); - if (d->memberEnd.contains(memberEnd)) { - d->memberEnd.removeAll(memberEnd); + if (_memberEnd.contains(memberEnd)) { + _memberEnd.removeAll(memberEnd); } } @@ -140,17 +126,15 @@ QSet<QUmlProperty *> QUmlAssociation::navigableOwnedEnd() const { // This is a read-write association end - QM_D(const QUmlAssociation); - return d->navigableOwnedEnd; + return _navigableOwnedEnd; } void QUmlAssociation::addNavigableOwnedEnd(QUmlProperty *navigableOwnedEnd) { // This is a read-write association end - QM_D(QUmlAssociation); - if (!d->navigableOwnedEnd.contains(navigableOwnedEnd)) { - d->navigableOwnedEnd.insert(navigableOwnedEnd); + if (!_navigableOwnedEnd.contains(navigableOwnedEnd)) { + _navigableOwnedEnd.insert(navigableOwnedEnd); } } @@ -158,9 +142,8 @@ void QUmlAssociation::removeNavigableOwnedEnd(QUmlProperty *navigableOwnedEnd) { // This is a read-write association end - QM_D(QUmlAssociation); - if (d->navigableOwnedEnd.contains(navigableOwnedEnd)) { - d->navigableOwnedEnd.remove(navigableOwnedEnd); + if (_navigableOwnedEnd.contains(navigableOwnedEnd)) { + _navigableOwnedEnd.remove(navigableOwnedEnd); } } @@ -171,17 +154,15 @@ QList<QUmlProperty *> QUmlAssociation::ownedEnd() const { // This is a read-write association end - QM_D(const QUmlAssociation); - return d->ownedEnd; + return _ownedEnd; } void QUmlAssociation::addOwnedEnd(QUmlProperty *ownedEnd) { // This is a read-write association end - QM_D(QUmlAssociation); - if (!d->ownedEnd.contains(ownedEnd)) { - d->ownedEnd.append(ownedEnd); + if (!_ownedEnd.contains(ownedEnd)) { + _ownedEnd.append(ownedEnd); } } @@ -189,9 +170,8 @@ void QUmlAssociation::removeOwnedEnd(QUmlProperty *ownedEnd) { // This is a read-write association end - QM_D(QUmlAssociation); - if (d->ownedEnd.contains(ownedEnd)) { - d->ownedEnd.removeAll(ownedEnd); + if (_ownedEnd.contains(ownedEnd)) { + _ownedEnd.removeAll(ownedEnd); } } diff --git a/src/uml/qumlassociation.h b/src/uml/qumlassociation.h index a028f276..702b4893 100644 --- a/src/uml/qumlassociation.h +++ b/src/uml/qumlassociation.h @@ -55,11 +55,10 @@ QT_MODULE(QtUml) class QUmlProperty; class QUmlType; -class QUmlAssociationPrivate; class Q_UML_EXPORT QUmlAssociation : public QUmlClassifier, public QUmlRelationship { public: - QUmlAssociation(bool create_d_ptr = true); + QUmlAssociation(); // Owned attributes QList<QUmlType *> endType() const; @@ -74,6 +73,12 @@ public: QList<QUmlProperty *> ownedEnd() const; void addOwnedEnd(QUmlProperty *ownedEnd); void removeOwnedEnd(QUmlProperty *ownedEnd); + +protected: + bool _isDerived; + QList<QUmlProperty *> _memberEnd; + QSet<QUmlProperty *> _navigableOwnedEnd; + QList<QUmlProperty *> _ownedEnd; }; QT_END_NAMESPACE diff --git a/src/uml/qumlassociation_p.h b/src/uml/qumlassociation_p.h deleted file mode 100644 index 7f28a856..00000000 --- a/src/uml/qumlassociation_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLASSOCIATION_P_H -#define QUMLASSOCIATION_P_H - -#include "QtUml/QUmlAssociation" - -#include "private/qumlclassifier_p.h" -#include "private/qumlrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAssociationPrivate : public QUmlClassifierPrivate, public QUmlRelationshipPrivate -{ -public: - QUmlAssociationPrivate(); - - bool isDerived; - QList<QUmlProperty *> memberEnd; - QSet<QUmlProperty *> navigableOwnedEnd; - QList<QUmlProperty *> ownedEnd; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLASSOCIATION_P_H - diff --git a/src/uml/qumlassociationclass.cpp b/src/uml/qumlassociationclass.cpp index 7039ed46..ae334917 100644 --- a/src/uml/qumlassociationclass.cpp +++ b/src/uml/qumlassociationclass.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlassociationclass.h" -#include "qumlassociationclass_p.h" QT_BEGIN_NAMESPACE -QUmlAssociationClassPrivate::QUmlAssociationClassPrivate() -{ -} - /*! \class QUmlAssociationClass @@ -55,12 +50,8 @@ QUmlAssociationClassPrivate::QUmlAssociationClassPrivate() \brief A model element that has both association and class properties. An AssociationClass can be seen as an association that also has class properties, or as a class that also has association properties. It not only connects a set of classifiers but also defines a set of features that belong to the relationship itself and not to any of the classifiers. */ -QUmlAssociationClass::QUmlAssociationClass(bool create_d_ptr) : - QUmlClass(false), - QUmlAssociation(false) +QUmlAssociationClass::QUmlAssociationClass() { - if (create_d_ptr) - set_d_ptr(new QUmlAssociationClassPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlassociationclass.h b/src/uml/qumlassociationclass.h index dd7e8148..215a76a6 100644 --- a/src/uml/qumlassociationclass.h +++ b/src/uml/qumlassociationclass.h @@ -52,11 +52,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlAssociationClassPrivate; class Q_UML_EXPORT QUmlAssociationClass : public QUmlClass, public QUmlAssociation { public: - QUmlAssociationClass(bool create_d_ptr = true); + QUmlAssociationClass(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlassociationclass_p.h b/src/uml/qumlassociationclass_p.h deleted file mode 100644 index ab4520d9..00000000 --- a/src/uml/qumlassociationclass_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLASSOCIATIONCLASS_P_H -#define QUMLASSOCIATIONCLASS_P_H - -#include "QtUml/QUmlAssociationClass" - -#include "private/qumlclass_p.h" -#include "private/qumlassociation_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlAssociationClassPrivate : public QUmlClassPrivate, public QUmlAssociationPrivate -{ -public: - QUmlAssociationClassPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLASSOCIATIONCLASS_P_H - diff --git a/src/uml/qumlbehavior.cpp b/src/uml/qumlbehavior.cpp index fc479273..698beb76 100644 --- a/src/uml/qumlbehavior.cpp +++ b/src/uml/qumlbehavior.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlbehavior.h" -#include "qumlbehavior_p.h" #include <QtUml/QUmlBehavioralFeature> #include <QtUml/QUmlBehavioredClassifier> @@ -49,12 +48,6 @@ QT_BEGIN_NAMESPACE -QUmlBehaviorPrivate::QUmlBehaviorPrivate() : - isReentrant(true), - specification(0) -{ -} - /*! \class QUmlBehavior @@ -63,11 +56,10 @@ QUmlBehaviorPrivate::QUmlBehaviorPrivate() : \brief Behavior is a specification of how its context classifier changes state over time. This specification may be either a definition of possible behavior execution or emergent behavior, or a selective illustration of an interesting subset of possible executions. The latter form is typically used for capturing examples, such as a trace of a particular execution.A behavior owns zero or more parameter sets. */ -QUmlBehavior::QUmlBehavior(bool create_d_ptr) : - QUmlClass(false) +QUmlBehavior::QUmlBehavior() : + _isReentrant(true), + _specification(0) { - if (create_d_ptr) - set_d_ptr(new QUmlBehaviorPrivate); } // OWNED ATTRIBUTES @@ -91,17 +83,15 @@ bool QUmlBehavior::isReentrant() const { // This is a read-write property - QM_D(const QUmlBehavior); - return d->isReentrant; + return _isReentrant; } void QUmlBehavior::setReentrant(bool isReentrant) { // This is a read-write property - QM_D(QUmlBehavior); - if (d->isReentrant != isReentrant) { - d->isReentrant = isReentrant; + if (_isReentrant != isReentrant) { + _isReentrant = isReentrant; } } @@ -112,17 +102,15 @@ QList<QUmlParameter *> QUmlBehavior::ownedParameter() const { // This is a read-write association end - QM_D(const QUmlBehavior); - return d->ownedParameter; + return _ownedParameter; } void QUmlBehavior::addOwnedParameter(QUmlParameter *ownedParameter) { // This is a read-write association end - QM_D(QUmlBehavior); - if (!d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.append(ownedParameter); + if (!_ownedParameter.contains(ownedParameter)) { + _ownedParameter.append(ownedParameter); } } @@ -130,9 +118,8 @@ void QUmlBehavior::removeOwnedParameter(QUmlParameter *ownedParameter) { // This is a read-write association end - QM_D(QUmlBehavior); - if (d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.removeAll(ownedParameter); + if (_ownedParameter.contains(ownedParameter)) { + _ownedParameter.removeAll(ownedParameter); } } @@ -143,17 +130,15 @@ QSet<QUmlParameterSet *> QUmlBehavior::ownedParameterSet() const { // This is a read-write association end - QM_D(const QUmlBehavior); - return d->ownedParameterSet; + return _ownedParameterSet; } void QUmlBehavior::addOwnedParameterSet(QUmlParameterSet *ownedParameterSet) { // This is a read-write association end - QM_D(QUmlBehavior); - if (!d->ownedParameterSet.contains(ownedParameterSet)) { - d->ownedParameterSet.insert(ownedParameterSet); + if (!_ownedParameterSet.contains(ownedParameterSet)) { + _ownedParameterSet.insert(ownedParameterSet); } } @@ -161,9 +146,8 @@ void QUmlBehavior::removeOwnedParameterSet(QUmlParameterSet *ownedParameterSet) { // This is a read-write association end - QM_D(QUmlBehavior); - if (d->ownedParameterSet.contains(ownedParameterSet)) { - d->ownedParameterSet.remove(ownedParameterSet); + if (_ownedParameterSet.contains(ownedParameterSet)) { + _ownedParameterSet.remove(ownedParameterSet); } } @@ -174,17 +158,15 @@ QSet<QUmlConstraint *> QUmlBehavior::postcondition() const { // This is a read-write association end - QM_D(const QUmlBehavior); - return d->postcondition; + return _postcondition; } void QUmlBehavior::addPostcondition(QUmlConstraint *postcondition) { // This is a read-write association end - QM_D(QUmlBehavior); - if (!d->postcondition.contains(postcondition)) { - d->postcondition.insert(postcondition); + if (!_postcondition.contains(postcondition)) { + _postcondition.insert(postcondition); } } @@ -192,9 +174,8 @@ void QUmlBehavior::removePostcondition(QUmlConstraint *postcondition) { // This is a read-write association end - QM_D(QUmlBehavior); - if (d->postcondition.contains(postcondition)) { - d->postcondition.remove(postcondition); + if (_postcondition.contains(postcondition)) { + _postcondition.remove(postcondition); } } @@ -205,17 +186,15 @@ QSet<QUmlConstraint *> QUmlBehavior::precondition() const { // This is a read-write association end - QM_D(const QUmlBehavior); - return d->precondition; + return _precondition; } void QUmlBehavior::addPrecondition(QUmlConstraint *precondition) { // This is a read-write association end - QM_D(QUmlBehavior); - if (!d->precondition.contains(precondition)) { - d->precondition.insert(precondition); + if (!_precondition.contains(precondition)) { + _precondition.insert(precondition); } } @@ -223,9 +202,8 @@ void QUmlBehavior::removePrecondition(QUmlConstraint *precondition) { // This is a read-write association end - QM_D(QUmlBehavior); - if (d->precondition.contains(precondition)) { - d->precondition.remove(precondition); + if (_precondition.contains(precondition)) { + _precondition.remove(precondition); } } @@ -236,17 +214,15 @@ QSet<QUmlBehavior *> QUmlBehavior::redefinedBehavior() const { // This is a read-write association end - QM_D(const QUmlBehavior); - return d->redefinedBehavior; + return _redefinedBehavior; } void QUmlBehavior::addRedefinedBehavior(QUmlBehavior *redefinedBehavior) { // This is a read-write association end - QM_D(QUmlBehavior); - if (!d->redefinedBehavior.contains(redefinedBehavior)) { - d->redefinedBehavior.insert(redefinedBehavior); + if (!_redefinedBehavior.contains(redefinedBehavior)) { + _redefinedBehavior.insert(redefinedBehavior); } } @@ -254,9 +230,8 @@ void QUmlBehavior::removeRedefinedBehavior(QUmlBehavior *redefinedBehavior) { // This is a read-write association end - QM_D(QUmlBehavior); - if (d->redefinedBehavior.contains(redefinedBehavior)) { - d->redefinedBehavior.remove(redefinedBehavior); + if (_redefinedBehavior.contains(redefinedBehavior)) { + _redefinedBehavior.remove(redefinedBehavior); } } @@ -267,17 +242,15 @@ QUmlBehavioralFeature *QUmlBehavior::specification() const { // This is a read-write association end - QM_D(const QUmlBehavior); - return d->specification; + return _specification; } void QUmlBehavior::setSpecification(QUmlBehavioralFeature *specification) { // This is a read-write association end - QM_D(QUmlBehavior); - if (d->specification != specification) { - d->specification = specification; + if (_specification != specification) { + _specification = specification; } } diff --git a/src/uml/qumlbehavior.h b/src/uml/qumlbehavior.h index 541570dc..f7bd1345 100644 --- a/src/uml/qumlbehavior.h +++ b/src/uml/qumlbehavior.h @@ -57,11 +57,10 @@ class QUmlConstraint; class QUmlParameter; class QUmlParameterSet; -class QUmlBehaviorPrivate; class Q_UML_EXPORT QUmlBehavior : public QUmlClass { public: - Q_DECL_HIDDEN QUmlBehavior(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlBehavior(); // Owned attributes QUmlBehavioredClassifier *context() const; @@ -84,6 +83,15 @@ public: void removeRedefinedBehavior(QUmlBehavior *redefinedBehavior); QUmlBehavioralFeature *specification() const; void setSpecification(QUmlBehavioralFeature *specification); + +protected: + bool _isReentrant; + QList<QUmlParameter *> _ownedParameter; + QSet<QUmlParameterSet *> _ownedParameterSet; + QSet<QUmlConstraint *> _postcondition; + QSet<QUmlConstraint *> _precondition; + QSet<QUmlBehavior *> _redefinedBehavior; + QUmlBehavioralFeature *_specification; }; QT_END_NAMESPACE diff --git a/src/uml/qumlbehavior_p.h b/src/uml/qumlbehavior_p.h deleted file mode 100644 index af4ee420..00000000 --- a/src/uml/qumlbehavior_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLBEHAVIOR_P_H -#define QUMLBEHAVIOR_P_H - -#include "QtUml/QUmlBehavior" - -#include "private/qumlclass_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlBehaviorPrivate : public QUmlClassPrivate -{ -public: - QUmlBehaviorPrivate(); - - bool isReentrant; - QList<QUmlParameter *> ownedParameter; - QSet<QUmlParameterSet *> ownedParameterSet; - QSet<QUmlConstraint *> postcondition; - QSet<QUmlConstraint *> precondition; - QSet<QUmlBehavior *> redefinedBehavior; - QUmlBehavioralFeature *specification; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLBEHAVIOR_P_H - diff --git a/src/uml/qumlbehavioralfeature.cpp b/src/uml/qumlbehavioralfeature.cpp index 51ff2aeb..380aed03 100644 --- a/src/uml/qumlbehavioralfeature.cpp +++ b/src/uml/qumlbehavioralfeature.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlbehavioralfeature.h" -#include "qumlbehavioralfeature_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlNamedElement> @@ -49,12 +48,6 @@ QT_BEGIN_NAMESPACE -QUmlBehavioralFeaturePrivate::QUmlBehavioralFeaturePrivate() : - concurrency(QtUml::CallConcurrencySequential), - isAbstract(false) -{ -} - /*! \class QUmlBehavioralFeature @@ -63,12 +56,10 @@ QUmlBehavioralFeaturePrivate::QUmlBehavioralFeaturePrivate() : \brief A behavioral feature is a feature of a classifier that specifies an aspect of the behavior of its instances.A behavioral feature is implemented (realized) by a behavior. A behavioral feature specifies that a classifier will respond to a designated request by invoking its implementing method.A behavioral feature owns zero or more parameter sets. */ -QUmlBehavioralFeature::QUmlBehavioralFeature(bool create_d_ptr) : - QUmlNamespace(false), - QUmlFeature(false) +QUmlBehavioralFeature::QUmlBehavioralFeature() : + _concurrency(QtUml::CallConcurrencySequential), + _isAbstract(false) { - if (create_d_ptr) - set_d_ptr(new QUmlBehavioralFeaturePrivate); } // OWNED ATTRIBUTES @@ -80,17 +71,15 @@ QtUml::CallConcurrencyKind QUmlBehavioralFeature::concurrency() const { // This is a read-write property - QM_D(const QUmlBehavioralFeature); - return d->concurrency; + return _concurrency; } void QUmlBehavioralFeature::setConcurrency(QtUml::CallConcurrencyKind concurrency) { // This is a read-write property - QM_D(QUmlBehavioralFeature); - if (d->concurrency != concurrency) { - d->concurrency = concurrency; + if (_concurrency != concurrency) { + _concurrency = concurrency; } } @@ -101,17 +90,15 @@ bool QUmlBehavioralFeature::isAbstract() const { // This is a read-write property - QM_D(const QUmlBehavioralFeature); - return d->isAbstract; + return _isAbstract; } void QUmlBehavioralFeature::setAbstract(bool isAbstract) { // This is a read-write property - QM_D(QUmlBehavioralFeature); - if (d->isAbstract != isAbstract) { - d->isAbstract = isAbstract; + if (_isAbstract != isAbstract) { + _isAbstract = isAbstract; } } @@ -122,17 +109,15 @@ QSet<QUmlBehavior *> QUmlBehavioralFeature::method() const { // This is a read-write association end - QM_D(const QUmlBehavioralFeature); - return d->method; + return _method; } void QUmlBehavioralFeature::addMethod(QUmlBehavior *method) { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (!d->method.contains(method)) { - d->method.insert(method); + if (!_method.contains(method)) { + _method.insert(method); } } @@ -140,9 +125,8 @@ void QUmlBehavioralFeature::removeMethod(QUmlBehavior *method) { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (d->method.contains(method)) { - d->method.remove(method); + if (_method.contains(method)) { + _method.remove(method); } } @@ -153,17 +137,15 @@ QList<QUmlParameter *> QUmlBehavioralFeature::ownedParameter() const { // This is a read-write association end - QM_D(const QUmlBehavioralFeature); - return d->ownedParameter; + return _ownedParameter; } void QUmlBehavioralFeature::addOwnedParameter(QUmlParameter *ownedParameter) { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (!d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.append(ownedParameter); + if (!_ownedParameter.contains(ownedParameter)) { + _ownedParameter.append(ownedParameter); } } @@ -171,9 +153,8 @@ void QUmlBehavioralFeature::removeOwnedParameter(QUmlParameter *ownedParameter) { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.removeAll(ownedParameter); + if (_ownedParameter.contains(ownedParameter)) { + _ownedParameter.removeAll(ownedParameter); } } @@ -184,17 +165,15 @@ QSet<QUmlParameterSet *> QUmlBehavioralFeature::ownedParameterSet() const { // This is a read-write association end - QM_D(const QUmlBehavioralFeature); - return d->ownedParameterSet; + return _ownedParameterSet; } void QUmlBehavioralFeature::addOwnedParameterSet(QUmlParameterSet *ownedParameterSet) { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (!d->ownedParameterSet.contains(ownedParameterSet)) { - d->ownedParameterSet.insert(ownedParameterSet); + if (!_ownedParameterSet.contains(ownedParameterSet)) { + _ownedParameterSet.insert(ownedParameterSet); } } @@ -202,9 +181,8 @@ void QUmlBehavioralFeature::removeOwnedParameterSet(QUmlParameterSet *ownedParam { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (d->ownedParameterSet.contains(ownedParameterSet)) { - d->ownedParameterSet.remove(ownedParameterSet); + if (_ownedParameterSet.contains(ownedParameterSet)) { + _ownedParameterSet.remove(ownedParameterSet); } } @@ -215,17 +193,15 @@ QSet<QUmlType *> QUmlBehavioralFeature::raisedException() const { // This is a read-write association end - QM_D(const QUmlBehavioralFeature); - return d->raisedException; + return _raisedException; } void QUmlBehavioralFeature::addRaisedException(QUmlType *raisedException) { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (!d->raisedException.contains(raisedException)) { - d->raisedException.insert(raisedException); + if (!_raisedException.contains(raisedException)) { + _raisedException.insert(raisedException); } } @@ -233,9 +209,8 @@ void QUmlBehavioralFeature::removeRaisedException(QUmlType *raisedException) { // This is a read-write association end - QM_D(QUmlBehavioralFeature); - if (d->raisedException.contains(raisedException)) { - d->raisedException.remove(raisedException); + if (_raisedException.contains(raisedException)) { + _raisedException.remove(raisedException); } } diff --git a/src/uml/qumlbehavioralfeature.h b/src/uml/qumlbehavioralfeature.h index c83cd3cf..4fb9b970 100644 --- a/src/uml/qumlbehavioralfeature.h +++ b/src/uml/qumlbehavioralfeature.h @@ -59,11 +59,10 @@ class QUmlParameter; class QUmlParameterSet; class QUmlType; -class QUmlBehavioralFeaturePrivate; class Q_UML_EXPORT QUmlBehavioralFeature : public QUmlNamespace, public QUmlFeature { public: - Q_DECL_HIDDEN QUmlBehavioralFeature(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlBehavioralFeature(); // Owned attributes QtUml::CallConcurrencyKind concurrency() const; @@ -85,6 +84,14 @@ public: // Operations bool isDistinguishableFrom(QUmlNamedElement *n, QUmlNamespace *ns) const; + +protected: + QtUml::CallConcurrencyKind _concurrency; + bool _isAbstract; + QSet<QUmlBehavior *> _method; + QList<QUmlParameter *> _ownedParameter; + QSet<QUmlParameterSet *> _ownedParameterSet; + QSet<QUmlType *> _raisedException; }; QT_END_NAMESPACE diff --git a/src/uml/qumlbehavioralfeature_p.h b/src/uml/qumlbehavioralfeature_p.h deleted file mode 100644 index a451c70e..00000000 --- a/src/uml/qumlbehavioralfeature_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLBEHAVIORALFEATURE_P_H -#define QUMLBEHAVIORALFEATURE_P_H - -#include "QtUml/QUmlBehavioralFeature" - -#include "private/qumlnamespace_p.h" -#include "private/qumlfeature_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlBehavioralFeaturePrivate : public QUmlNamespacePrivate, public QUmlFeaturePrivate -{ -public: - QUmlBehavioralFeaturePrivate(); - - QtUml::CallConcurrencyKind concurrency; - bool isAbstract; - QSet<QUmlBehavior *> method; - QList<QUmlParameter *> ownedParameter; - QSet<QUmlParameterSet *> ownedParameterSet; - QSet<QUmlType *> raisedException; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLBEHAVIORALFEATURE_P_H - diff --git a/src/uml/qumlbehavioredclassifier.cpp b/src/uml/qumlbehavioredclassifier.cpp index 061465b0..cb802d14 100644 --- a/src/uml/qumlbehavioredclassifier.cpp +++ b/src/uml/qumlbehavioredclassifier.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlbehavioredclassifier.h" -#include "qumlbehavioredclassifier_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlInterfaceRealization> QT_BEGIN_NAMESPACE -QUmlBehavioredClassifierPrivate::QUmlBehavioredClassifierPrivate() : - classifierBehavior(0) -{ -} - /*! \class QUmlBehavioredClassifier @@ -59,11 +53,9 @@ QUmlBehavioredClassifierPrivate::QUmlBehavioredClassifierPrivate() : \brief A behaviored classifier may have an interface realization.A classifier can have behavior specifications defined in its namespace. One of these may specify the behavior of the classifier itself. */ -QUmlBehavioredClassifier::QUmlBehavioredClassifier(bool create_d_ptr) : - QUmlClassifier(false) +QUmlBehavioredClassifier::QUmlBehavioredClassifier() : + _classifierBehavior(0) { - if (create_d_ptr) - set_d_ptr(new QUmlBehavioredClassifierPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlBehavior *QUmlBehavioredClassifier::classifierBehavior() const { // This is a read-write association end - QM_D(const QUmlBehavioredClassifier); - return d->classifierBehavior; + return _classifierBehavior; } void QUmlBehavioredClassifier::setClassifierBehavior(QUmlBehavior *classifierBehavior) { // This is a read-write association end - QM_D(QUmlBehavioredClassifier); - if (d->classifierBehavior != classifierBehavior) { - d->classifierBehavior = classifierBehavior; + if (_classifierBehavior != classifierBehavior) { + _classifierBehavior = classifierBehavior; } } @@ -96,17 +86,15 @@ QSet<QUmlInterfaceRealization *> QUmlBehavioredClassifier::interfaceRealization( { // This is a read-write association end - QM_D(const QUmlBehavioredClassifier); - return d->interfaceRealization; + return _interfaceRealization; } void QUmlBehavioredClassifier::addInterfaceRealization(QUmlInterfaceRealization *interfaceRealization) { // This is a read-write association end - QM_D(QUmlBehavioredClassifier); - if (!d->interfaceRealization.contains(interfaceRealization)) { - d->interfaceRealization.insert(interfaceRealization); + if (!_interfaceRealization.contains(interfaceRealization)) { + _interfaceRealization.insert(interfaceRealization); } } @@ -114,9 +102,8 @@ void QUmlBehavioredClassifier::removeInterfaceRealization(QUmlInterfaceRealizati { // This is a read-write association end - QM_D(QUmlBehavioredClassifier); - if (d->interfaceRealization.contains(interfaceRealization)) { - d->interfaceRealization.remove(interfaceRealization); + if (_interfaceRealization.contains(interfaceRealization)) { + _interfaceRealization.remove(interfaceRealization); } } @@ -127,17 +114,15 @@ QSet<QUmlBehavior *> QUmlBehavioredClassifier::ownedBehavior() const { // This is a read-write association end - QM_D(const QUmlBehavioredClassifier); - return d->ownedBehavior; + return _ownedBehavior; } void QUmlBehavioredClassifier::addOwnedBehavior(QUmlBehavior *ownedBehavior) { // This is a read-write association end - QM_D(QUmlBehavioredClassifier); - if (!d->ownedBehavior.contains(ownedBehavior)) { - d->ownedBehavior.insert(ownedBehavior); + if (!_ownedBehavior.contains(ownedBehavior)) { + _ownedBehavior.insert(ownedBehavior); } } @@ -145,9 +130,8 @@ void QUmlBehavioredClassifier::removeOwnedBehavior(QUmlBehavior *ownedBehavior) { // This is a read-write association end - QM_D(QUmlBehavioredClassifier); - if (d->ownedBehavior.contains(ownedBehavior)) { - d->ownedBehavior.remove(ownedBehavior); + if (_ownedBehavior.contains(ownedBehavior)) { + _ownedBehavior.remove(ownedBehavior); } } diff --git a/src/uml/qumlbehavioredclassifier.h b/src/uml/qumlbehavioredclassifier.h index fcc9b519..80855a92 100644 --- a/src/uml/qumlbehavioredclassifier.h +++ b/src/uml/qumlbehavioredclassifier.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlBehavior; class QUmlInterfaceRealization; -class QUmlBehavioredClassifierPrivate; class Q_UML_EXPORT QUmlBehavioredClassifier : public QUmlClassifier { public: - Q_DECL_HIDDEN QUmlBehavioredClassifier(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlBehavioredClassifier(); // Owned attributes QUmlBehavior *classifierBehavior() const; @@ -69,6 +68,11 @@ public: QSet<QUmlBehavior *> ownedBehavior() const; void addOwnedBehavior(QUmlBehavior *ownedBehavior); void removeOwnedBehavior(QUmlBehavior *ownedBehavior); + +protected: + QUmlBehavior *_classifierBehavior; + QSet<QUmlInterfaceRealization *> _interfaceRealization; + QSet<QUmlBehavior *> _ownedBehavior; }; QT_END_NAMESPACE diff --git a/src/uml/qumlbehavioredclassifier_p.h b/src/uml/qumlbehavioredclassifier_p.h deleted file mode 100644 index ff03dea1..00000000 --- a/src/uml/qumlbehavioredclassifier_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLBEHAVIOREDCLASSIFIER_P_H -#define QUMLBEHAVIOREDCLASSIFIER_P_H - -#include "QtUml/QUmlBehavioredClassifier" - -#include "private/qumlclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlBehavioredClassifierPrivate : public QUmlClassifierPrivate -{ -public: - QUmlBehavioredClassifierPrivate(); - - QUmlBehavior *classifierBehavior; - QSet<QUmlInterfaceRealization *> interfaceRealization; - QSet<QUmlBehavior *> ownedBehavior; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLBEHAVIOREDCLASSIFIER_P_H - diff --git a/src/uml/qumlbehaviorexecutionspecification.cpp b/src/uml/qumlbehaviorexecutionspecification.cpp index a9d3bd76..94f86b84 100644 --- a/src/uml/qumlbehaviorexecutionspecification.cpp +++ b/src/uml/qumlbehaviorexecutionspecification.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlbehaviorexecutionspecification.h" -#include "qumlbehaviorexecutionspecification_p.h" #include <QtUml/QUmlBehavior> QT_BEGIN_NAMESPACE -QUmlBehaviorExecutionSpecificationPrivate::QUmlBehaviorExecutionSpecificationPrivate() : - behavior(0) -{ -} - /*! \class QUmlBehaviorExecutionSpecification @@ -58,11 +52,9 @@ QUmlBehaviorExecutionSpecificationPrivate::QUmlBehaviorExecutionSpecificationPri \brief A behavior execution specification is a kind of execution specification representing the execution of a behavior. */ -QUmlBehaviorExecutionSpecification::QUmlBehaviorExecutionSpecification(bool create_d_ptr) : - QUmlExecutionSpecification(false) +QUmlBehaviorExecutionSpecification::QUmlBehaviorExecutionSpecification() : + _behavior(0) { - if (create_d_ptr) - set_d_ptr(new QUmlBehaviorExecutionSpecificationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlBehavior *QUmlBehaviorExecutionSpecification::behavior() const { // This is a read-write association end - QM_D(const QUmlBehaviorExecutionSpecification); - return d->behavior; + return _behavior; } void QUmlBehaviorExecutionSpecification::setBehavior(QUmlBehavior *behavior) { // This is a read-write association end - QM_D(QUmlBehaviorExecutionSpecification); - if (d->behavior != behavior) { - d->behavior = behavior; + if (_behavior != behavior) { + _behavior = behavior; } } diff --git a/src/uml/qumlbehaviorexecutionspecification.h b/src/uml/qumlbehaviorexecutionspecification.h index df698668..f1d8f9b6 100644 --- a/src/uml/qumlbehaviorexecutionspecification.h +++ b/src/uml/qumlbehaviorexecutionspecification.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlBehavior; -class QUmlBehaviorExecutionSpecificationPrivate; class Q_UML_EXPORT QUmlBehaviorExecutionSpecification : public QUmlExecutionSpecification { public: - QUmlBehaviorExecutionSpecification(bool create_d_ptr = true); + QUmlBehaviorExecutionSpecification(); // Owned attributes QUmlBehavior *behavior() const; void setBehavior(QUmlBehavior *behavior); + +protected: + QUmlBehavior *_behavior; }; QT_END_NAMESPACE diff --git a/src/uml/qumlbehaviorexecutionspecification_p.h b/src/uml/qumlbehaviorexecutionspecification_p.h deleted file mode 100644 index 20d5c39b..00000000 --- a/src/uml/qumlbehaviorexecutionspecification_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLBEHAVIOREXECUTIONSPECIFICATION_P_H -#define QUMLBEHAVIOREXECUTIONSPECIFICATION_P_H - -#include "QtUml/QUmlBehaviorExecutionSpecification" - -#include "private/qumlexecutionspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlBehaviorExecutionSpecificationPrivate : public QUmlExecutionSpecificationPrivate -{ -public: - QUmlBehaviorExecutionSpecificationPrivate(); - - QUmlBehavior *behavior; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLBEHAVIOREXECUTIONSPECIFICATION_P_H - diff --git a/src/uml/qumlbroadcastsignalaction.cpp b/src/uml/qumlbroadcastsignalaction.cpp index a00205ed..56409fd4 100644 --- a/src/uml/qumlbroadcastsignalaction.cpp +++ b/src/uml/qumlbroadcastsignalaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlbroadcastsignalaction.h" -#include "qumlbroadcastsignalaction_p.h" #include <QtUml/QUmlSignal> QT_BEGIN_NAMESPACE -QUmlBroadcastSignalActionPrivate::QUmlBroadcastSignalActionPrivate() : - signal(0) -{ -} - /*! \class QUmlBroadcastSignalAction @@ -58,11 +52,9 @@ QUmlBroadcastSignalActionPrivate::QUmlBroadcastSignalActionPrivate() : \brief A broadcast signal action is an action that transmits a signal instance to all the potential target objects in the system, which may cause the firing of a state machine transitions or the execution of associated activities of a target object. The argument values are available to the execution of associated behaviors. The requestor continues execution immediately after the signals are sent out. It does not wait for receipt. Any reply messages are ignored and are not transmitted to the requestor. */ -QUmlBroadcastSignalAction::QUmlBroadcastSignalAction(bool create_d_ptr) : - QUmlInvocationAction(false) +QUmlBroadcastSignalAction::QUmlBroadcastSignalAction() : + _signal(0) { - if (create_d_ptr) - set_d_ptr(new QUmlBroadcastSignalActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlSignal *QUmlBroadcastSignalAction::signal() const { // This is a read-write association end - QM_D(const QUmlBroadcastSignalAction); - return d->signal; + return _signal; } void QUmlBroadcastSignalAction::setSignal(QUmlSignal *signal) { // This is a read-write association end - QM_D(QUmlBroadcastSignalAction); - if (d->signal != signal) { - d->signal = signal; + if (_signal != signal) { + _signal = signal; } } diff --git a/src/uml/qumlbroadcastsignalaction.h b/src/uml/qumlbroadcastsignalaction.h index 05a882f8..7443733a 100644 --- a/src/uml/qumlbroadcastsignalaction.h +++ b/src/uml/qumlbroadcastsignalaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlSignal; -class QUmlBroadcastSignalActionPrivate; class Q_UML_EXPORT QUmlBroadcastSignalAction : public QUmlInvocationAction { public: - QUmlBroadcastSignalAction(bool create_d_ptr = true); + QUmlBroadcastSignalAction(); // Owned attributes QUmlSignal *signal() const; void setSignal(QUmlSignal *signal); + +protected: + QUmlSignal *_signal; }; QT_END_NAMESPACE diff --git a/src/uml/qumlbroadcastsignalaction_p.h b/src/uml/qumlbroadcastsignalaction_p.h deleted file mode 100644 index cd3822b6..00000000 --- a/src/uml/qumlbroadcastsignalaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLBROADCASTSIGNALACTION_P_H -#define QUMLBROADCASTSIGNALACTION_P_H - -#include "QtUml/QUmlBroadcastSignalAction" - -#include "private/qumlinvocationaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlBroadcastSignalActionPrivate : public QUmlInvocationActionPrivate -{ -public: - QUmlBroadcastSignalActionPrivate(); - - QUmlSignal *signal; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLBROADCASTSIGNALACTION_P_H - diff --git a/src/uml/qumlcallaction.cpp b/src/uml/qumlcallaction.cpp index 4dc99c39..6ee26816 100644 --- a/src/uml/qumlcallaction.cpp +++ b/src/uml/qumlcallaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlcallaction.h" -#include "qumlcallaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlCallActionPrivate::QUmlCallActionPrivate() : - isSynchronous(true) -{ -} - /*! \class QUmlCallAction @@ -58,11 +52,9 @@ QUmlCallActionPrivate::QUmlCallActionPrivate() : \brief CallAction is an abstract class for actions that invoke behavior and receive return values. */ -QUmlCallAction::QUmlCallAction(bool create_d_ptr) : - QUmlInvocationAction(false) +QUmlCallAction::QUmlCallAction() : + _isSynchronous(true) { - if (create_d_ptr) - set_d_ptr(new QUmlCallActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ bool QUmlCallAction::isSynchronous() const { // This is a read-write property - QM_D(const QUmlCallAction); - return d->isSynchronous; + return _isSynchronous; } void QUmlCallAction::setSynchronous(bool isSynchronous) { // This is a read-write property - QM_D(QUmlCallAction); - if (d->isSynchronous != isSynchronous) { - d->isSynchronous = isSynchronous; + if (_isSynchronous != isSynchronous) { + _isSynchronous = isSynchronous; } } @@ -95,17 +85,15 @@ QList<QUmlOutputPin *> QUmlCallAction::result() const { // This is a read-write association end - QM_D(const QUmlCallAction); - return d->result; + return _result; } void QUmlCallAction::addResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlCallAction); - if (!d->result.contains(result)) { - d->result.append(result); + if (!_result.contains(result)) { + _result.append(result); } } @@ -113,9 +101,8 @@ void QUmlCallAction::removeResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlCallAction); - if (d->result.contains(result)) { - d->result.removeAll(result); + if (_result.contains(result)) { + _result.removeAll(result); } } diff --git a/src/uml/qumlcallaction.h b/src/uml/qumlcallaction.h index e2f44df0..b9ed4445 100644 --- a/src/uml/qumlcallaction.h +++ b/src/uml/qumlcallaction.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlCallActionPrivate; class Q_UML_EXPORT QUmlCallAction : public QUmlInvocationAction { public: - Q_DECL_HIDDEN QUmlCallAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlCallAction(); // Owned attributes bool isSynchronous() const; @@ -65,6 +64,10 @@ public: QList<QUmlOutputPin *> result() const; void addResult(QUmlOutputPin *result); void removeResult(QUmlOutputPin *result); + +protected: + bool _isSynchronous; + QList<QUmlOutputPin *> _result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcallaction_p.h b/src/uml/qumlcallaction_p.h deleted file mode 100644 index a237aaac..00000000 --- a/src/uml/qumlcallaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCALLACTION_P_H -#define QUMLCALLACTION_P_H - -#include "QtUml/QUmlCallAction" - -#include "private/qumlinvocationaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCallActionPrivate : public QUmlInvocationActionPrivate -{ -public: - QUmlCallActionPrivate(); - - bool isSynchronous; - QList<QUmlOutputPin *> result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCALLACTION_P_H - diff --git a/src/uml/qumlcallbehavioraction.cpp b/src/uml/qumlcallbehavioraction.cpp index cedb2a3a..99cdcddd 100644 --- a/src/uml/qumlcallbehavioraction.cpp +++ b/src/uml/qumlcallbehavioraction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlcallbehavioraction.h" -#include "qumlcallbehavioraction_p.h" #include <QtUml/QUmlBehavior> QT_BEGIN_NAMESPACE -QUmlCallBehaviorActionPrivate::QUmlCallBehaviorActionPrivate() : - behavior(0) -{ -} - /*! \class QUmlCallBehaviorAction @@ -58,11 +52,9 @@ QUmlCallBehaviorActionPrivate::QUmlCallBehaviorActionPrivate() : \brief A call behavior action is a call action that invokes a behavior directly rather than invoking a behavioral feature that, in turn, results in the invocation of that behavior. The argument values of the action are available to the execution of the invoked behavior. For synchronous calls the execution of the call behavior action waits until the execution of the invoked behavior completes and a result is returned on its output pin. The action completes immediately without a result, if the call is asynchronous. In particular, the invoked behavior may be an activity. */ -QUmlCallBehaviorAction::QUmlCallBehaviorAction(bool create_d_ptr) : - QUmlCallAction(false) +QUmlCallBehaviorAction::QUmlCallBehaviorAction() : + _behavior(0) { - if (create_d_ptr) - set_d_ptr(new QUmlCallBehaviorActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlBehavior *QUmlCallBehaviorAction::behavior() const { // This is a read-write association end - QM_D(const QUmlCallBehaviorAction); - return d->behavior; + return _behavior; } void QUmlCallBehaviorAction::setBehavior(QUmlBehavior *behavior) { // This is a read-write association end - QM_D(QUmlCallBehaviorAction); - if (d->behavior != behavior) { - d->behavior = behavior; + if (_behavior != behavior) { + _behavior = behavior; } } diff --git a/src/uml/qumlcallbehavioraction.h b/src/uml/qumlcallbehavioraction.h index e34b5a63..a43c6743 100644 --- a/src/uml/qumlcallbehavioraction.h +++ b/src/uml/qumlcallbehavioraction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlBehavior; -class QUmlCallBehaviorActionPrivate; class Q_UML_EXPORT QUmlCallBehaviorAction : public QUmlCallAction { public: - QUmlCallBehaviorAction(bool create_d_ptr = true); + QUmlCallBehaviorAction(); // Owned attributes QUmlBehavior *behavior() const; void setBehavior(QUmlBehavior *behavior); + +protected: + QUmlBehavior *_behavior; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcallbehavioraction_p.h b/src/uml/qumlcallbehavioraction_p.h deleted file mode 100644 index f76600cd..00000000 --- a/src/uml/qumlcallbehavioraction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCALLBEHAVIORACTION_P_H -#define QUMLCALLBEHAVIORACTION_P_H - -#include "QtUml/QUmlCallBehaviorAction" - -#include "private/qumlcallaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCallBehaviorActionPrivate : public QUmlCallActionPrivate -{ -public: - QUmlCallBehaviorActionPrivate(); - - QUmlBehavior *behavior; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCALLBEHAVIORACTION_P_H - diff --git a/src/uml/qumlcallevent.cpp b/src/uml/qumlcallevent.cpp index d9e8cc78..9caeed69 100644 --- a/src/uml/qumlcallevent.cpp +++ b/src/uml/qumlcallevent.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlcallevent.h" -#include "qumlcallevent_p.h" #include <QtUml/QUmlOperation> QT_BEGIN_NAMESPACE -QUmlCallEventPrivate::QUmlCallEventPrivate() : - operation(0) -{ -} - /*! \class QUmlCallEvent @@ -58,11 +52,9 @@ QUmlCallEventPrivate::QUmlCallEventPrivate() : \brief A call event models the receipt by an object of a message invoking a call of an operation. */ -QUmlCallEvent::QUmlCallEvent(bool create_d_ptr) : - QUmlMessageEvent(false) +QUmlCallEvent::QUmlCallEvent() : + _operation(0) { - if (create_d_ptr) - set_d_ptr(new QUmlCallEventPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOperation *QUmlCallEvent::operation() const { // This is a read-write association end - QM_D(const QUmlCallEvent); - return d->operation; + return _operation; } void QUmlCallEvent::setOperation(QUmlOperation *operation) { // This is a read-write association end - QM_D(QUmlCallEvent); - if (d->operation != operation) { - d->operation = operation; + if (_operation != operation) { + _operation = operation; } } diff --git a/src/uml/qumlcallevent.h b/src/uml/qumlcallevent.h index 2f400fab..b0f6a4bc 100644 --- a/src/uml/qumlcallevent.h +++ b/src/uml/qumlcallevent.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOperation; -class QUmlCallEventPrivate; class Q_UML_EXPORT QUmlCallEvent : public QUmlMessageEvent { public: - QUmlCallEvent(bool create_d_ptr = true); + QUmlCallEvent(); // Owned attributes QUmlOperation *operation() const; void setOperation(QUmlOperation *operation); + +protected: + QUmlOperation *_operation; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcallevent_p.h b/src/uml/qumlcallevent_p.h deleted file mode 100644 index f010956f..00000000 --- a/src/uml/qumlcallevent_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCALLEVENT_P_H -#define QUMLCALLEVENT_P_H - -#include "QtUml/QUmlCallEvent" - -#include "private/qumlmessageevent_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCallEventPrivate : public QUmlMessageEventPrivate -{ -public: - QUmlCallEventPrivate(); - - QUmlOperation *operation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCALLEVENT_P_H - diff --git a/src/uml/qumlcalloperationaction.cpp b/src/uml/qumlcalloperationaction.cpp index fd6bc9a1..eb62a376 100644 --- a/src/uml/qumlcalloperationaction.cpp +++ b/src/uml/qumlcalloperationaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlcalloperationaction.h" -#include "qumlcalloperationaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOperation> QT_BEGIN_NAMESPACE -QUmlCallOperationActionPrivate::QUmlCallOperationActionPrivate() : - operation(0), - target(0) -{ -} - /*! \class QUmlCallOperationAction @@ -60,11 +53,10 @@ QUmlCallOperationActionPrivate::QUmlCallOperationActionPrivate() : \brief A call operation action is an action that transmits an operation call request to the target object, where it may cause the invocation of associated behavior. The argument values of the action are available to the execution of the invoked behavior. If the action is marked synchronous, the execution of the call operation action waits until the execution of the invoked behavior completes and a reply transmission is returned to the caller; otherwise execution of the action is complete when the invocation of the operation is established and the execution of the invoked operation proceeds concurrently with the execution of the calling behavior. Any values returned as part of the reply transmission are put on the result output pins of the call operation action. Upon receipt of the reply transmission, execution of the call operation action is complete. */ -QUmlCallOperationAction::QUmlCallOperationAction(bool create_d_ptr) : - QUmlCallAction(false) +QUmlCallOperationAction::QUmlCallOperationAction() : + _operation(0), + _target(0) { - if (create_d_ptr) - set_d_ptr(new QUmlCallOperationActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlOperation *QUmlCallOperationAction::operation() const { // This is a read-write association end - QM_D(const QUmlCallOperationAction); - return d->operation; + return _operation; } void QUmlCallOperationAction::setOperation(QUmlOperation *operation) { // This is a read-write association end - QM_D(QUmlCallOperationAction); - if (d->operation != operation) { - d->operation = operation; + if (_operation != operation) { + _operation = operation; } } @@ -97,17 +87,15 @@ QUmlInputPin *QUmlCallOperationAction::target() const { // This is a read-write association end - QM_D(const QUmlCallOperationAction); - return d->target; + return _target; } void QUmlCallOperationAction::setTarget(QUmlInputPin *target) { // This is a read-write association end - QM_D(QUmlCallOperationAction); - if (d->target != target) { - d->target = target; + if (_target != target) { + _target = target; } } diff --git a/src/uml/qumlcalloperationaction.h b/src/uml/qumlcalloperationaction.h index a1fa9442..dcfc662e 100644 --- a/src/uml/qumlcalloperationaction.h +++ b/src/uml/qumlcalloperationaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlOperation; -class QUmlCallOperationActionPrivate; class Q_UML_EXPORT QUmlCallOperationAction : public QUmlCallAction { public: - QUmlCallOperationAction(bool create_d_ptr = true); + QUmlCallOperationAction(); // Owned attributes QUmlOperation *operation() const; void setOperation(QUmlOperation *operation); QUmlInputPin *target() const; void setTarget(QUmlInputPin *target); + +protected: + QUmlOperation *_operation; + QUmlInputPin *_target; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcalloperationaction_p.h b/src/uml/qumlcalloperationaction_p.h deleted file mode 100644 index ced01e93..00000000 --- a/src/uml/qumlcalloperationaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCALLOPERATIONACTION_P_H -#define QUMLCALLOPERATIONACTION_P_H - -#include "QtUml/QUmlCallOperationAction" - -#include "private/qumlcallaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCallOperationActionPrivate : public QUmlCallActionPrivate -{ -public: - QUmlCallOperationActionPrivate(); - - QUmlOperation *operation; - QUmlInputPin *target; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCALLOPERATIONACTION_P_H - diff --git a/src/uml/qumlcentralbuffernode.cpp b/src/uml/qumlcentralbuffernode.cpp index 38e8765b..bf7e97bc 100644 --- a/src/uml/qumlcentralbuffernode.cpp +++ b/src/uml/qumlcentralbuffernode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlcentralbuffernode.h" -#include "qumlcentralbuffernode_p.h" QT_BEGIN_NAMESPACE -QUmlCentralBufferNodePrivate::QUmlCentralBufferNodePrivate() -{ -} - /*! \class QUmlCentralBufferNode @@ -55,11 +50,8 @@ QUmlCentralBufferNodePrivate::QUmlCentralBufferNodePrivate() \brief A central buffer node is an object node for managing flows from multiple sources and destinations. */ -QUmlCentralBufferNode::QUmlCentralBufferNode(bool create_d_ptr) : - QUmlObjectNode(false) +QUmlCentralBufferNode::QUmlCentralBufferNode() { - if (create_d_ptr) - set_d_ptr(new QUmlCentralBufferNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlcentralbuffernode.h b/src/uml/qumlcentralbuffernode.h index ea5bdeae..aac72963 100644 --- a/src/uml/qumlcentralbuffernode.h +++ b/src/uml/qumlcentralbuffernode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlCentralBufferNodePrivate; class Q_UML_EXPORT QUmlCentralBufferNode : public QUmlObjectNode { public: - QUmlCentralBufferNode(bool create_d_ptr = true); + QUmlCentralBufferNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlcentralbuffernode_p.h b/src/uml/qumlcentralbuffernode_p.h deleted file mode 100644 index 5e2308c3..00000000 --- a/src/uml/qumlcentralbuffernode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCENTRALBUFFERNODE_P_H -#define QUMLCENTRALBUFFERNODE_P_H - -#include "QtUml/QUmlCentralBufferNode" - -#include "private/qumlobjectnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCentralBufferNodePrivate : public QUmlObjectNodePrivate -{ -public: - QUmlCentralBufferNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCENTRALBUFFERNODE_P_H - diff --git a/src/uml/qumlchangeevent.cpp b/src/uml/qumlchangeevent.cpp index 66e45ba4..ae72fccc 100644 --- a/src/uml/qumlchangeevent.cpp +++ b/src/uml/qumlchangeevent.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlchangeevent.h" -#include "qumlchangeevent_p.h" #include <QtUml/QUmlValueSpecification> QT_BEGIN_NAMESPACE -QUmlChangeEventPrivate::QUmlChangeEventPrivate() : - changeExpression(0) -{ -} - /*! \class QUmlChangeEvent @@ -58,11 +52,9 @@ QUmlChangeEventPrivate::QUmlChangeEventPrivate() : \brief A change event models a change in the system configuration that makes a condition true. */ -QUmlChangeEvent::QUmlChangeEvent(bool create_d_ptr) : - QUmlEvent(false) +QUmlChangeEvent::QUmlChangeEvent() : + _changeExpression(0) { - if (create_d_ptr) - set_d_ptr(new QUmlChangeEventPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlValueSpecification *QUmlChangeEvent::changeExpression() const { // This is a read-write association end - QM_D(const QUmlChangeEvent); - return d->changeExpression; + return _changeExpression; } void QUmlChangeEvent::setChangeExpression(QUmlValueSpecification *changeExpression) { // This is a read-write association end - QM_D(QUmlChangeEvent); - if (d->changeExpression != changeExpression) { - d->changeExpression = changeExpression; + if (_changeExpression != changeExpression) { + _changeExpression = changeExpression; } } diff --git a/src/uml/qumlchangeevent.h b/src/uml/qumlchangeevent.h index 177298e2..7612cf41 100644 --- a/src/uml/qumlchangeevent.h +++ b/src/uml/qumlchangeevent.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlValueSpecification; -class QUmlChangeEventPrivate; class Q_UML_EXPORT QUmlChangeEvent : public QUmlEvent { public: - QUmlChangeEvent(bool create_d_ptr = true); + QUmlChangeEvent(); // Owned attributes QUmlValueSpecification *changeExpression() const; void setChangeExpression(QUmlValueSpecification *changeExpression); + +protected: + QUmlValueSpecification *_changeExpression; }; QT_END_NAMESPACE diff --git a/src/uml/qumlchangeevent_p.h b/src/uml/qumlchangeevent_p.h deleted file mode 100644 index 93ef9cd8..00000000 --- a/src/uml/qumlchangeevent_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCHANGEEVENT_P_H -#define QUMLCHANGEEVENT_P_H - -#include "QtUml/QUmlChangeEvent" - -#include "private/qumlevent_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlChangeEventPrivate : public QUmlEventPrivate -{ -public: - QUmlChangeEventPrivate(); - - QUmlValueSpecification *changeExpression; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCHANGEEVENT_P_H - diff --git a/src/uml/qumlclass.cpp b/src/uml/qumlclass.cpp index 82e3dcd7..071f3268 100644 --- a/src/uml/qumlclass.cpp +++ b/src/uml/qumlclass.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlclass.h" -#include "qumlclass_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlExtension> @@ -50,12 +49,6 @@ QT_BEGIN_NAMESPACE -QUmlClassPrivate::QUmlClassPrivate() : - isAbstract(false), - isActive(false) -{ -} - /*! \class QUmlClass @@ -64,12 +57,10 @@ QUmlClassPrivate::QUmlClassPrivate() : \brief A class may be designated as active (i.e., each of its instances having its own thread of control) or passive (i.e., each of its instances executing within the context of some other object). A class may also specify which signals the instances of this class handle.A class describes a set of objects that share the same specifications of features, constraints, and semantics.A class has the capability to have an internal structure and ports.Class has derived association that indicates how it may be extended through one or more stereotypes. Stereotype is the only kind of metaclass that cannot be extended by stereotypes. */ -QUmlClass::QUmlClass(bool create_d_ptr) : - QUmlEncapsulatedClassifier(false), - QUmlBehavioredClassifier(false) +QUmlClass::QUmlClass() : + _isAbstract(false), + _isActive(false) { - if (create_d_ptr) - set_d_ptr(new QUmlClassPrivate); } // OWNED ATTRIBUTES @@ -93,17 +84,15 @@ bool QUmlClass::isAbstract() const { // This is a read-write property - QM_D(const QUmlClass); - return d->isAbstract; + return _isAbstract; } void QUmlClass::setAbstract(bool isAbstract) { // This is a read-write property - QM_D(QUmlClass); - if (d->isAbstract != isAbstract) { - d->isAbstract = isAbstract; + if (_isAbstract != isAbstract) { + _isAbstract = isAbstract; } } @@ -114,17 +103,15 @@ bool QUmlClass::isActive() const { // This is a read-write property - QM_D(const QUmlClass); - return d->isActive; + return _isActive; } void QUmlClass::setActive(bool isActive) { // This is a read-write property - QM_D(QUmlClass); - if (d->isActive != isActive) { - d->isActive = isActive; + if (_isActive != isActive) { + _isActive = isActive; } } @@ -135,17 +122,15 @@ QList<QUmlClassifier *> QUmlClass::nestedClassifier() const { // This is a read-write association end - QM_D(const QUmlClass); - return d->nestedClassifier; + return _nestedClassifier; } void QUmlClass::addNestedClassifier(QUmlClassifier *nestedClassifier) { // This is a read-write association end - QM_D(QUmlClass); - if (!d->nestedClassifier.contains(nestedClassifier)) { - d->nestedClassifier.append(nestedClassifier); + if (!_nestedClassifier.contains(nestedClassifier)) { + _nestedClassifier.append(nestedClassifier); } } @@ -153,9 +138,8 @@ void QUmlClass::removeNestedClassifier(QUmlClassifier *nestedClassifier) { // This is a read-write association end - QM_D(QUmlClass); - if (d->nestedClassifier.contains(nestedClassifier)) { - d->nestedClassifier.removeAll(nestedClassifier); + if (_nestedClassifier.contains(nestedClassifier)) { + _nestedClassifier.removeAll(nestedClassifier); } } @@ -166,17 +150,15 @@ QList<QUmlProperty *> QUmlClass::ownedAttribute() const { // This is a read-write association end - QM_D(const QUmlClass); - return d->ownedAttribute; + return _ownedAttribute; } void QUmlClass::addOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlClass); - if (!d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.append(ownedAttribute); + if (!_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.append(ownedAttribute); } } @@ -184,9 +166,8 @@ void QUmlClass::removeOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlClass); - if (d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.removeAll(ownedAttribute); + if (_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.removeAll(ownedAttribute); } } @@ -197,17 +178,15 @@ QList<QUmlOperation *> QUmlClass::ownedOperation() const { // This is a read-write association end - QM_D(const QUmlClass); - return d->ownedOperation; + return _ownedOperation; } void QUmlClass::addOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlClass); - if (!d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.append(ownedOperation); + if (!_ownedOperation.contains(ownedOperation)) { + _ownedOperation.append(ownedOperation); } } @@ -215,9 +194,8 @@ void QUmlClass::removeOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlClass); - if (d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.removeAll(ownedOperation); + if (_ownedOperation.contains(ownedOperation)) { + _ownedOperation.removeAll(ownedOperation); } } @@ -228,17 +206,15 @@ QSet<QUmlReception *> QUmlClass::ownedReception() const { // This is a read-write association end - QM_D(const QUmlClass); - return d->ownedReception; + return _ownedReception; } void QUmlClass::addOwnedReception(QUmlReception *ownedReception) { // This is a read-write association end - QM_D(QUmlClass); - if (!d->ownedReception.contains(ownedReception)) { - d->ownedReception.insert(ownedReception); + if (!_ownedReception.contains(ownedReception)) { + _ownedReception.insert(ownedReception); } } @@ -246,9 +222,8 @@ void QUmlClass::removeOwnedReception(QUmlReception *ownedReception) { // This is a read-write association end - QM_D(QUmlClass); - if (d->ownedReception.contains(ownedReception)) { - d->ownedReception.remove(ownedReception); + if (_ownedReception.contains(ownedReception)) { + _ownedReception.remove(ownedReception); } } diff --git a/src/uml/qumlclass.h b/src/uml/qumlclass.h index 6c8e957b..121393e4 100644 --- a/src/uml/qumlclass.h +++ b/src/uml/qumlclass.h @@ -59,11 +59,10 @@ class QUmlOperation; class QUmlProperty; class QUmlReception; -class QUmlClassPrivate; class Q_UML_EXPORT QUmlClass : public QUmlEncapsulatedClassifier, public QUmlBehavioredClassifier { public: - QUmlClass(bool create_d_ptr = true); + QUmlClass(); // Owned attributes QSet<QUmlExtension *> extension() const; @@ -89,6 +88,14 @@ public: // Operations QSet<QUmlNamedElement *> inherit(QSet<QUmlNamedElement *> inhs) const; + +protected: + bool _isAbstract; + bool _isActive; + QList<QUmlClassifier *> _nestedClassifier; + QList<QUmlProperty *> _ownedAttribute; + QList<QUmlOperation *> _ownedOperation; + QSet<QUmlReception *> _ownedReception; }; QT_END_NAMESPACE diff --git a/src/uml/qumlclass_p.h b/src/uml/qumlclass_p.h deleted file mode 100644 index f94447ef..00000000 --- a/src/uml/qumlclass_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCLASS_P_H -#define QUMLCLASS_P_H - -#include "QtUml/QUmlClass" - -#include "private/qumlencapsulatedclassifier_p.h" -#include "private/qumlbehavioredclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlClassPrivate : public QUmlEncapsulatedClassifierPrivate, public QUmlBehavioredClassifierPrivate -{ -public: - QUmlClassPrivate(); - - bool isAbstract; - bool isActive; - QList<QUmlClassifier *> nestedClassifier; - QList<QUmlProperty *> ownedAttribute; - QList<QUmlOperation *> ownedOperation; - QSet<QUmlReception *> ownedReception; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCLASS_P_H - diff --git a/src/uml/qumlclassifier.cpp b/src/uml/qumlclassifier.cpp index 04f0330d..9938b3ea 100644 --- a/src/uml/qumlclassifier.cpp +++ b/src/uml/qumlclassifier.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlclassifier.h" -#include "qumlclassifier_p.h" #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> @@ -54,15 +53,6 @@ QT_BEGIN_NAMESPACE -QUmlClassifierPrivate::QUmlClassifierPrivate() : - isAbstract(false), - isFinalSpecialization(false), - ownedTemplateSignature(0), - representation(0), - templateParameter(0) -{ -} - /*! \class QUmlClassifier @@ -71,14 +61,13 @@ QUmlClassifierPrivate::QUmlClassifierPrivate() : \brief A classifier is a classification of instances - it describes a set of instances that have features in common. A classifier can specify a generalization hierarchy by referencing its general classifiers.A classifier has the capability to own use cases. Although the owning classifier typically represents the subject to which the owned use cases apply, this is not necessarily the case. In principle, the same use case can be applied to multiple subjects, as identified by the subject association role of a use case.Classifier is defined to be a kind of templateable element so that a classifier can be parameterized. It is also defined to be a kind of parameterable element so that a classifier can be a formal template parameter.A classifier has the capability to own collaboration uses. These collaboration uses link a collaboration with the classifier to give a description of the workings of the classifier. */ -QUmlClassifier::QUmlClassifier(bool create_d_ptr) : - QUmlNamespace(false), - QUmlType(false), - QUmlRedefinableElement(false), - QUmlTemplateableElement(false) +QUmlClassifier::QUmlClassifier() : + _isAbstract(false), + _isFinalSpecialization(false), + _ownedTemplateSignature(0), + _representation(0), + _templateParameter(0) { - if (create_d_ptr) - set_d_ptr(new QUmlClassifierPrivate); } // OWNED ATTRIBUTES @@ -90,8 +79,7 @@ QSet<QUmlProperty *> QUmlClassifier::attribute() const { // This is a read-only derived union association end - QM_D(const QUmlClassifier); - return d->attribute; + return _attribute; } /*! @@ -101,17 +89,15 @@ QSet<QUmlCollaborationUse *> QUmlClassifier::collaborationUse() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->collaborationUse; + return _collaborationUse; } void QUmlClassifier::addCollaborationUse(QUmlCollaborationUse *collaborationUse) { // This is a read-write association end - QM_D(QUmlClassifier); - if (!d->collaborationUse.contains(collaborationUse)) { - d->collaborationUse.insert(collaborationUse); + if (!_collaborationUse.contains(collaborationUse)) { + _collaborationUse.insert(collaborationUse); } } @@ -119,9 +105,8 @@ void QUmlClassifier::removeCollaborationUse(QUmlCollaborationUse *collaborationU { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->collaborationUse.contains(collaborationUse)) { - d->collaborationUse.remove(collaborationUse); + if (_collaborationUse.contains(collaborationUse)) { + _collaborationUse.remove(collaborationUse); } } @@ -132,8 +117,7 @@ QSet<QUmlFeature *> QUmlClassifier::feature() const { // This is a read-only derived union association end - QM_D(const QUmlClassifier); - return d->feature; + return _feature; } /*! @@ -179,17 +163,15 @@ QSet<QUmlGeneralization *> QUmlClassifier::generalization() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->generalization; + return _generalization; } void QUmlClassifier::addGeneralization(QUmlGeneralization *generalization) { // This is a read-write association end - QM_D(QUmlClassifier); - if (!d->generalization.contains(generalization)) { - d->generalization.insert(generalization); + if (!_generalization.contains(generalization)) { + _generalization.insert(generalization); } } @@ -197,9 +179,8 @@ void QUmlClassifier::removeGeneralization(QUmlGeneralization *generalization) { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->generalization.contains(generalization)) { - d->generalization.remove(generalization); + if (_generalization.contains(generalization)) { + _generalization.remove(generalization); } } @@ -222,17 +203,15 @@ bool QUmlClassifier::isAbstract() const { // This is a read-write property - QM_D(const QUmlClassifier); - return d->isAbstract; + return _isAbstract; } void QUmlClassifier::setAbstract(bool isAbstract) { // This is a read-write property - QM_D(QUmlClassifier); - if (d->isAbstract != isAbstract) { - d->isAbstract = isAbstract; + if (_isAbstract != isAbstract) { + _isAbstract = isAbstract; } } @@ -243,17 +222,15 @@ bool QUmlClassifier::isFinalSpecialization() const { // This is a read-write property - QM_D(const QUmlClassifier); - return d->isFinalSpecialization; + return _isFinalSpecialization; } void QUmlClassifier::setFinalSpecialization(bool isFinalSpecialization) { // This is a read-write property - QM_D(QUmlClassifier); - if (d->isFinalSpecialization != isFinalSpecialization) { - d->isFinalSpecialization = isFinalSpecialization; + if (_isFinalSpecialization != isFinalSpecialization) { + _isFinalSpecialization = isFinalSpecialization; } } @@ -264,17 +241,15 @@ QUmlRedefinableTemplateSignature *QUmlClassifier::ownedTemplateSignature() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->ownedTemplateSignature; + return _ownedTemplateSignature; } void QUmlClassifier::setOwnedTemplateSignature(QUmlRedefinableTemplateSignature *ownedTemplateSignature) { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->ownedTemplateSignature != ownedTemplateSignature) { - d->ownedTemplateSignature = ownedTemplateSignature; + if (_ownedTemplateSignature != ownedTemplateSignature) { + _ownedTemplateSignature = ownedTemplateSignature; } } @@ -285,17 +260,15 @@ QSet<QUmlUseCase *> QUmlClassifier::ownedUseCase() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->ownedUseCase; + return _ownedUseCase; } void QUmlClassifier::addOwnedUseCase(QUmlUseCase *ownedUseCase) { // This is a read-write association end - QM_D(QUmlClassifier); - if (!d->ownedUseCase.contains(ownedUseCase)) { - d->ownedUseCase.insert(ownedUseCase); + if (!_ownedUseCase.contains(ownedUseCase)) { + _ownedUseCase.insert(ownedUseCase); } } @@ -303,9 +276,8 @@ void QUmlClassifier::removeOwnedUseCase(QUmlUseCase *ownedUseCase) { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->ownedUseCase.contains(ownedUseCase)) { - d->ownedUseCase.remove(ownedUseCase); + if (_ownedUseCase.contains(ownedUseCase)) { + _ownedUseCase.remove(ownedUseCase); } } @@ -316,17 +288,15 @@ QSet<QUmlGeneralizationSet *> QUmlClassifier::powertypeExtent() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->powertypeExtent; + return _powertypeExtent; } void QUmlClassifier::addPowertypeExtent(QUmlGeneralizationSet *powertypeExtent) { // This is a read-write association end - QM_D(QUmlClassifier); - if (!d->powertypeExtent.contains(powertypeExtent)) { - d->powertypeExtent.insert(powertypeExtent); + if (!_powertypeExtent.contains(powertypeExtent)) { + _powertypeExtent.insert(powertypeExtent); } } @@ -334,9 +304,8 @@ void QUmlClassifier::removePowertypeExtent(QUmlGeneralizationSet *powertypeExten { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->powertypeExtent.contains(powertypeExtent)) { - d->powertypeExtent.remove(powertypeExtent); + if (_powertypeExtent.contains(powertypeExtent)) { + _powertypeExtent.remove(powertypeExtent); } } @@ -347,17 +316,15 @@ QSet<QUmlClassifier *> QUmlClassifier::redefinedClassifier() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->redefinedClassifier; + return _redefinedClassifier; } void QUmlClassifier::addRedefinedClassifier(QUmlClassifier *redefinedClassifier) { // This is a read-write association end - QM_D(QUmlClassifier); - if (!d->redefinedClassifier.contains(redefinedClassifier)) { - d->redefinedClassifier.insert(redefinedClassifier); + if (!_redefinedClassifier.contains(redefinedClassifier)) { + _redefinedClassifier.insert(redefinedClassifier); } } @@ -365,9 +332,8 @@ void QUmlClassifier::removeRedefinedClassifier(QUmlClassifier *redefinedClassifi { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->redefinedClassifier.contains(redefinedClassifier)) { - d->redefinedClassifier.remove(redefinedClassifier); + if (_redefinedClassifier.contains(redefinedClassifier)) { + _redefinedClassifier.remove(redefinedClassifier); } } @@ -378,17 +344,15 @@ QUmlCollaborationUse *QUmlClassifier::representation() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->representation; + return _representation; } void QUmlClassifier::setRepresentation(QUmlCollaborationUse *representation) { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->representation != representation) { - d->representation = representation; + if (_representation != representation) { + _representation = representation; } } @@ -399,17 +363,15 @@ QSet<QUmlSubstitution *> QUmlClassifier::substitution() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->substitution; + return _substitution; } void QUmlClassifier::addSubstitution(QUmlSubstitution *substitution) { // This is a read-write association end - QM_D(QUmlClassifier); - if (!d->substitution.contains(substitution)) { - d->substitution.insert(substitution); + if (!_substitution.contains(substitution)) { + _substitution.insert(substitution); } } @@ -417,9 +379,8 @@ void QUmlClassifier::removeSubstitution(QUmlSubstitution *substitution) { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->substitution.contains(substitution)) { - d->substitution.remove(substitution); + if (_substitution.contains(substitution)) { + _substitution.remove(substitution); } } @@ -430,17 +391,15 @@ QUmlClassifierTemplateParameter *QUmlClassifier::templateParameter() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->templateParameter; + return _templateParameter; } void QUmlClassifier::setTemplateParameter(QUmlClassifierTemplateParameter *templateParameter) { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->templateParameter != templateParameter) { - d->templateParameter = templateParameter; + if (_templateParameter != templateParameter) { + _templateParameter = templateParameter; } } @@ -451,17 +410,15 @@ QSet<QUmlUseCase *> QUmlClassifier::useCase() const { // This is a read-write association end - QM_D(const QUmlClassifier); - return d->useCase; + return _useCase; } void QUmlClassifier::addUseCase(QUmlUseCase *useCase) { // This is a read-write association end - QM_D(QUmlClassifier); - if (!d->useCase.contains(useCase)) { - d->useCase.insert(useCase); + if (!_useCase.contains(useCase)) { + _useCase.insert(useCase); } } @@ -469,9 +426,8 @@ void QUmlClassifier::removeUseCase(QUmlUseCase *useCase) { // This is a read-write association end - QM_D(QUmlClassifier); - if (d->useCase.contains(useCase)) { - d->useCase.remove(useCase); + if (_useCase.contains(useCase)) { + _useCase.remove(useCase); } } diff --git a/src/uml/qumlclassifier.h b/src/uml/qumlclassifier.h index a01771e9..831b98b6 100644 --- a/src/uml/qumlclassifier.h +++ b/src/uml/qumlclassifier.h @@ -65,11 +65,10 @@ class QUmlRedefinableTemplateSignature; class QUmlSubstitution; class QUmlUseCase; -class QUmlClassifierPrivate; class Q_UML_EXPORT QUmlClassifier : public QUmlNamespace, public QUmlType, public QUmlRedefinableElement, public QUmlTemplateableElement { public: - Q_DECL_HIDDEN QUmlClassifier(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlClassifier(); // Owned attributes QSet<QUmlProperty *> attribute() const; @@ -120,6 +119,22 @@ public: bool isTemplate() const; bool maySpecializeType(QUmlClassifier *c) const; QSet<QUmlClassifier *> parents() const; + +protected: + QSet<QUmlProperty *> _attribute; + QSet<QUmlCollaborationUse *> _collaborationUse; + QSet<QUmlFeature *> _feature; + QSet<QUmlGeneralization *> _generalization; + bool _isAbstract; + bool _isFinalSpecialization; + QUmlRedefinableTemplateSignature *_ownedTemplateSignature; + QSet<QUmlUseCase *> _ownedUseCase; + QSet<QUmlGeneralizationSet *> _powertypeExtent; + QSet<QUmlClassifier *> _redefinedClassifier; + QUmlCollaborationUse *_representation; + QSet<QUmlSubstitution *> _substitution; + QUmlClassifierTemplateParameter *_templateParameter; + QSet<QUmlUseCase *> _useCase; }; QT_END_NAMESPACE diff --git a/src/uml/qumlclassifier_p.h b/src/uml/qumlclassifier_p.h deleted file mode 100644 index 58d83b11..00000000 --- a/src/uml/qumlclassifier_p.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCLASSIFIER_P_H -#define QUMLCLASSIFIER_P_H - -#include "QtUml/QUmlClassifier" - -#include "private/qumlnamespace_p.h" -#include "private/qumltype_p.h" -#include "private/qumlredefinableelement_p.h" -#include "private/qumltemplateableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlClassifierPrivate : public QUmlNamespacePrivate, public QUmlTypePrivate, public QUmlRedefinableElementPrivate, public QUmlTemplateableElementPrivate -{ -public: - QUmlClassifierPrivate(); - - QSet<QUmlProperty *> attribute; - QSet<QUmlCollaborationUse *> collaborationUse; - QSet<QUmlFeature *> feature; - QSet<QUmlGeneralization *> generalization; - bool isAbstract; - bool isFinalSpecialization; - QUmlRedefinableTemplateSignature *ownedTemplateSignature; - QSet<QUmlUseCase *> ownedUseCase; - QSet<QUmlGeneralizationSet *> powertypeExtent; - QSet<QUmlClassifier *> redefinedClassifier; - QUmlCollaborationUse *representation; - QSet<QUmlSubstitution *> substitution; - QUmlClassifierTemplateParameter *templateParameter; - QSet<QUmlUseCase *> useCase; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCLASSIFIER_P_H - diff --git a/src/uml/qumlclassifiertemplateparameter.cpp b/src/uml/qumlclassifiertemplateparameter.cpp index dbd38548..c4d66314 100644 --- a/src/uml/qumlclassifiertemplateparameter.cpp +++ b/src/uml/qumlclassifiertemplateparameter.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlclassifiertemplateparameter.h" -#include "qumlclassifiertemplateparameter_p.h" #include <QtUml/QUmlClassifier> QT_BEGIN_NAMESPACE -QUmlClassifierTemplateParameterPrivate::QUmlClassifierTemplateParameterPrivate() : - allowSubstitutable(true), - parameteredElement(0) -{ -} - /*! \class QUmlClassifierTemplateParameter @@ -59,11 +52,10 @@ QUmlClassifierTemplateParameterPrivate::QUmlClassifierTemplateParameterPrivate() \brief A classifier template parameter exposes a classifier as a formal template parameter. */ -QUmlClassifierTemplateParameter::QUmlClassifierTemplateParameter(bool create_d_ptr) : - QUmlTemplateParameter(false) +QUmlClassifierTemplateParameter::QUmlClassifierTemplateParameter() : + _allowSubstitutable(true), + _parameteredElement(0) { - if (create_d_ptr) - set_d_ptr(new QUmlClassifierTemplateParameterPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ bool QUmlClassifierTemplateParameter::allowSubstitutable() const { // This is a read-write property - QM_D(const QUmlClassifierTemplateParameter); - return d->allowSubstitutable; + return _allowSubstitutable; } void QUmlClassifierTemplateParameter::setAllowSubstitutable(bool allowSubstitutable) { // This is a read-write property - QM_D(QUmlClassifierTemplateParameter); - if (d->allowSubstitutable != allowSubstitutable) { - d->allowSubstitutable = allowSubstitutable; + if (_allowSubstitutable != allowSubstitutable) { + _allowSubstitutable = allowSubstitutable; } } @@ -96,17 +86,15 @@ QSet<QUmlClassifier *> QUmlClassifierTemplateParameter::constrainingClassifier() { // This is a read-write association end - QM_D(const QUmlClassifierTemplateParameter); - return d->constrainingClassifier; + return _constrainingClassifier; } void QUmlClassifierTemplateParameter::addConstrainingClassifier(QUmlClassifier *constrainingClassifier) { // This is a read-write association end - QM_D(QUmlClassifierTemplateParameter); - if (!d->constrainingClassifier.contains(constrainingClassifier)) { - d->constrainingClassifier.insert(constrainingClassifier); + if (!_constrainingClassifier.contains(constrainingClassifier)) { + _constrainingClassifier.insert(constrainingClassifier); } } @@ -114,9 +102,8 @@ void QUmlClassifierTemplateParameter::removeConstrainingClassifier(QUmlClassifie { // This is a read-write association end - QM_D(QUmlClassifierTemplateParameter); - if (d->constrainingClassifier.contains(constrainingClassifier)) { - d->constrainingClassifier.remove(constrainingClassifier); + if (_constrainingClassifier.contains(constrainingClassifier)) { + _constrainingClassifier.remove(constrainingClassifier); } } @@ -127,17 +114,15 @@ QUmlClassifier *QUmlClassifierTemplateParameter::parameteredElement() const { // This is a read-write association end - QM_D(const QUmlClassifierTemplateParameter); - return d->parameteredElement; + return _parameteredElement; } void QUmlClassifierTemplateParameter::setParameteredElement(QUmlClassifier *parameteredElement) { // This is a read-write association end - QM_D(QUmlClassifierTemplateParameter); - if (d->parameteredElement != parameteredElement) { - d->parameteredElement = parameteredElement; + if (_parameteredElement != parameteredElement) { + _parameteredElement = parameteredElement; } } diff --git a/src/uml/qumlclassifiertemplateparameter.h b/src/uml/qumlclassifiertemplateparameter.h index 0cbe6e6c..84ca8295 100644 --- a/src/uml/qumlclassifiertemplateparameter.h +++ b/src/uml/qumlclassifiertemplateparameter.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlClassifier; -class QUmlClassifierTemplateParameterPrivate; class Q_UML_EXPORT QUmlClassifierTemplateParameter : public QUmlTemplateParameter { public: - QUmlClassifierTemplateParameter(bool create_d_ptr = true); + QUmlClassifierTemplateParameter(); // Owned attributes bool allowSubstitutable() const; @@ -67,6 +66,11 @@ public: void removeConstrainingClassifier(QUmlClassifier *constrainingClassifier); QUmlClassifier *parameteredElement() const; void setParameteredElement(QUmlClassifier *parameteredElement); + +protected: + bool _allowSubstitutable; + QSet<QUmlClassifier *> _constrainingClassifier; + QUmlClassifier *_parameteredElement; }; QT_END_NAMESPACE diff --git a/src/uml/qumlclassifiertemplateparameter_p.h b/src/uml/qumlclassifiertemplateparameter_p.h deleted file mode 100644 index 6f392e10..00000000 --- a/src/uml/qumlclassifiertemplateparameter_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCLASSIFIERTEMPLATEPARAMETER_P_H -#define QUMLCLASSIFIERTEMPLATEPARAMETER_P_H - -#include "QtUml/QUmlClassifierTemplateParameter" - -#include "private/qumltemplateparameter_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlClassifierTemplateParameterPrivate : public QUmlTemplateParameterPrivate -{ -public: - QUmlClassifierTemplateParameterPrivate(); - - bool allowSubstitutable; - QSet<QUmlClassifier *> constrainingClassifier; - QUmlClassifier *parameteredElement; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCLASSIFIERTEMPLATEPARAMETER_P_H - diff --git a/src/uml/qumlclause.cpp b/src/uml/qumlclause.cpp index d8084f03..503fc684 100644 --- a/src/uml/qumlclause.cpp +++ b/src/uml/qumlclause.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlclause.h" -#include "qumlclause_p.h" #include <QtUml/QUmlExecutableNode> #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlClausePrivate::QUmlClausePrivate() : - decider(0) -{ -} - /*! \class QUmlClause @@ -59,11 +53,9 @@ QUmlClausePrivate::QUmlClausePrivate() : \brief A clause is an element that represents a single branch of a conditional construct, including a test and a body section. The body section is executed only if (but not necessarily if) the test section evaluates true. */ -QUmlClause::QUmlClause(bool create_d_ptr) : - QUmlElement(false) +QUmlClause::QUmlClause() : + _decider(0) { - if (create_d_ptr) - set_d_ptr(new QUmlClausePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QSet<QUmlExecutableNode *> QUmlClause::body() const { // This is a read-write association end - QM_D(const QUmlClause); - return d->body; + return _body; } void QUmlClause::addBody(QUmlExecutableNode *body) { // This is a read-write association end - QM_D(QUmlClause); - if (!d->body.contains(body)) { - d->body.insert(body); + if (!_body.contains(body)) { + _body.insert(body); } } @@ -93,9 +83,8 @@ void QUmlClause::removeBody(QUmlExecutableNode *body) { // This is a read-write association end - QM_D(QUmlClause); - if (d->body.contains(body)) { - d->body.remove(body); + if (_body.contains(body)) { + _body.remove(body); } } @@ -106,17 +95,15 @@ QList<QUmlOutputPin *> QUmlClause::bodyOutput() const { // This is a read-write association end - QM_D(const QUmlClause); - return d->bodyOutput; + return _bodyOutput; } void QUmlClause::addBodyOutput(QUmlOutputPin *bodyOutput) { // This is a read-write association end - QM_D(QUmlClause); - if (!d->bodyOutput.contains(bodyOutput)) { - d->bodyOutput.append(bodyOutput); + if (!_bodyOutput.contains(bodyOutput)) { + _bodyOutput.append(bodyOutput); } } @@ -124,9 +111,8 @@ void QUmlClause::removeBodyOutput(QUmlOutputPin *bodyOutput) { // This is a read-write association end - QM_D(QUmlClause); - if (d->bodyOutput.contains(bodyOutput)) { - d->bodyOutput.removeAll(bodyOutput); + if (_bodyOutput.contains(bodyOutput)) { + _bodyOutput.removeAll(bodyOutput); } } @@ -137,17 +123,15 @@ QUmlOutputPin *QUmlClause::decider() const { // This is a read-write association end - QM_D(const QUmlClause); - return d->decider; + return _decider; } void QUmlClause::setDecider(QUmlOutputPin *decider) { // This is a read-write association end - QM_D(QUmlClause); - if (d->decider != decider) { - d->decider = decider; + if (_decider != decider) { + _decider = decider; } } @@ -158,17 +142,15 @@ QSet<QUmlClause *> QUmlClause::predecessorClause() const { // This is a read-write association end - QM_D(const QUmlClause); - return d->predecessorClause; + return _predecessorClause; } void QUmlClause::addPredecessorClause(QUmlClause *predecessorClause) { // This is a read-write association end - QM_D(QUmlClause); - if (!d->predecessorClause.contains(predecessorClause)) { - d->predecessorClause.insert(predecessorClause); + if (!_predecessorClause.contains(predecessorClause)) { + _predecessorClause.insert(predecessorClause); } } @@ -176,9 +158,8 @@ void QUmlClause::removePredecessorClause(QUmlClause *predecessorClause) { // This is a read-write association end - QM_D(QUmlClause); - if (d->predecessorClause.contains(predecessorClause)) { - d->predecessorClause.remove(predecessorClause); + if (_predecessorClause.contains(predecessorClause)) { + _predecessorClause.remove(predecessorClause); } } @@ -189,17 +170,15 @@ QSet<QUmlClause *> QUmlClause::successorClause() const { // This is a read-write association end - QM_D(const QUmlClause); - return d->successorClause; + return _successorClause; } void QUmlClause::addSuccessorClause(QUmlClause *successorClause) { // This is a read-write association end - QM_D(QUmlClause); - if (!d->successorClause.contains(successorClause)) { - d->successorClause.insert(successorClause); + if (!_successorClause.contains(successorClause)) { + _successorClause.insert(successorClause); } } @@ -207,9 +186,8 @@ void QUmlClause::removeSuccessorClause(QUmlClause *successorClause) { // This is a read-write association end - QM_D(QUmlClause); - if (d->successorClause.contains(successorClause)) { - d->successorClause.remove(successorClause); + if (_successorClause.contains(successorClause)) { + _successorClause.remove(successorClause); } } @@ -220,17 +198,15 @@ QSet<QUmlExecutableNode *> QUmlClause::test() const { // This is a read-write association end - QM_D(const QUmlClause); - return d->test; + return _test; } void QUmlClause::addTest(QUmlExecutableNode *test) { // This is a read-write association end - QM_D(QUmlClause); - if (!d->test.contains(test)) { - d->test.insert(test); + if (!_test.contains(test)) { + _test.insert(test); } } @@ -238,9 +214,8 @@ void QUmlClause::removeTest(QUmlExecutableNode *test) { // This is a read-write association end - QM_D(QUmlClause); - if (d->test.contains(test)) { - d->test.remove(test); + if (_test.contains(test)) { + _test.remove(test); } } diff --git a/src/uml/qumlclause.h b/src/uml/qumlclause.h index 9db0c75e..fda4503b 100644 --- a/src/uml/qumlclause.h +++ b/src/uml/qumlclause.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlExecutableNode; class QUmlOutputPin; -class QUmlClausePrivate; class Q_UML_EXPORT QUmlClause : public QUmlElement { public: - QUmlClause(bool create_d_ptr = true); + QUmlClause(); // Owned attributes QSet<QUmlExecutableNode *> body() const; @@ -78,6 +77,14 @@ public: QSet<QUmlExecutableNode *> test() const; void addTest(QUmlExecutableNode *test); void removeTest(QUmlExecutableNode *test); + +protected: + QSet<QUmlExecutableNode *> _body; + QList<QUmlOutputPin *> _bodyOutput; + QUmlOutputPin *_decider; + QSet<QUmlClause *> _predecessorClause; + QSet<QUmlClause *> _successorClause; + QSet<QUmlExecutableNode *> _test; }; QT_END_NAMESPACE diff --git a/src/uml/qumlclause_p.h b/src/uml/qumlclause_p.h deleted file mode 100644 index fc12be0a..00000000 --- a/src/uml/qumlclause_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCLAUSE_P_H -#define QUMLCLAUSE_P_H - -#include "QtUml/QUmlClause" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlClausePrivate : public QUmlElementPrivate -{ -public: - QUmlClausePrivate(); - - QSet<QUmlExecutableNode *> body; - QList<QUmlOutputPin *> bodyOutput; - QUmlOutputPin *decider; - QSet<QUmlClause *> predecessorClause; - QSet<QUmlClause *> successorClause; - QSet<QUmlExecutableNode *> test; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCLAUSE_P_H - diff --git a/src/uml/qumlclearassociationaction.cpp b/src/uml/qumlclearassociationaction.cpp index 4d54a3fa..efde62e2 100644 --- a/src/uml/qumlclearassociationaction.cpp +++ b/src/uml/qumlclearassociationaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlclearassociationaction.h" -#include "qumlclearassociationaction_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlClearAssociationActionPrivate::QUmlClearAssociationActionPrivate() : - association(0), - object(0) -{ -} - /*! \class QUmlClearAssociationAction @@ -60,11 +53,10 @@ QUmlClearAssociationActionPrivate::QUmlClearAssociationActionPrivate() : \brief A clear association action is an action that destroys all links of an association in which a particular object participates. */ -QUmlClearAssociationAction::QUmlClearAssociationAction(bool create_d_ptr) : - QUmlAction(false) +QUmlClearAssociationAction::QUmlClearAssociationAction() : + _association(0), + _object(0) { - if (create_d_ptr) - set_d_ptr(new QUmlClearAssociationActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlAssociation *QUmlClearAssociationAction::association() const { // This is a read-write association end - QM_D(const QUmlClearAssociationAction); - return d->association; + return _association; } void QUmlClearAssociationAction::setAssociation(QUmlAssociation *association) { // This is a read-write association end - QM_D(QUmlClearAssociationAction); - if (d->association != association) { - d->association = association; + if (_association != association) { + _association = association; } } @@ -97,17 +87,15 @@ QUmlInputPin *QUmlClearAssociationAction::object() const { // This is a read-write association end - QM_D(const QUmlClearAssociationAction); - return d->object; + return _object; } void QUmlClearAssociationAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlClearAssociationAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } diff --git a/src/uml/qumlclearassociationaction.h b/src/uml/qumlclearassociationaction.h index 981bd770..9f9706a3 100644 --- a/src/uml/qumlclearassociationaction.h +++ b/src/uml/qumlclearassociationaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlAssociation; class QUmlInputPin; -class QUmlClearAssociationActionPrivate; class Q_UML_EXPORT QUmlClearAssociationAction : public QUmlAction { public: - QUmlClearAssociationAction(bool create_d_ptr = true); + QUmlClearAssociationAction(); // Owned attributes QUmlAssociation *association() const; void setAssociation(QUmlAssociation *association); QUmlInputPin *object() const; void setObject(QUmlInputPin *object); + +protected: + QUmlAssociation *_association; + QUmlInputPin *_object; }; QT_END_NAMESPACE diff --git a/src/uml/qumlclearassociationaction_p.h b/src/uml/qumlclearassociationaction_p.h deleted file mode 100644 index 1b83d434..00000000 --- a/src/uml/qumlclearassociationaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCLEARASSOCIATIONACTION_P_H -#define QUMLCLEARASSOCIATIONACTION_P_H - -#include "QtUml/QUmlClearAssociationAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlClearAssociationActionPrivate : public QUmlActionPrivate -{ -public: - QUmlClearAssociationActionPrivate(); - - QUmlAssociation *association; - QUmlInputPin *object; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCLEARASSOCIATIONACTION_P_H - diff --git a/src/uml/qumlclearstructuralfeatureaction.cpp b/src/uml/qumlclearstructuralfeatureaction.cpp index 2927b143..5d055222 100644 --- a/src/uml/qumlclearstructuralfeatureaction.cpp +++ b/src/uml/qumlclearstructuralfeatureaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlclearstructuralfeatureaction.h" -#include "qumlclearstructuralfeatureaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlClearStructuralFeatureActionPrivate::QUmlClearStructuralFeatureActionPrivate() : - result(0) -{ -} - /*! \class QUmlClearStructuralFeatureAction @@ -58,11 +52,9 @@ QUmlClearStructuralFeatureActionPrivate::QUmlClearStructuralFeatureActionPrivate \brief A clear structural feature action is a structural feature action that removes all values of a structural feature. */ -QUmlClearStructuralFeatureAction::QUmlClearStructuralFeatureAction(bool create_d_ptr) : - QUmlStructuralFeatureAction(false) +QUmlClearStructuralFeatureAction::QUmlClearStructuralFeatureAction() : + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlClearStructuralFeatureActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOutputPin *QUmlClearStructuralFeatureAction::result() const { // This is a read-write association end - QM_D(const QUmlClearStructuralFeatureAction); - return d->result; + return _result; } void QUmlClearStructuralFeatureAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlClearStructuralFeatureAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlclearstructuralfeatureaction.h b/src/uml/qumlclearstructuralfeatureaction.h index 767c715b..ba038f16 100644 --- a/src/uml/qumlclearstructuralfeatureaction.h +++ b/src/uml/qumlclearstructuralfeatureaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlClearStructuralFeatureActionPrivate; class Q_UML_EXPORT QUmlClearStructuralFeatureAction : public QUmlStructuralFeatureAction { public: - QUmlClearStructuralFeatureAction(bool create_d_ptr = true); + QUmlClearStructuralFeatureAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlclearstructuralfeatureaction_p.h b/src/uml/qumlclearstructuralfeatureaction_p.h deleted file mode 100644 index d1e9b5c0..00000000 --- a/src/uml/qumlclearstructuralfeatureaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCLEARSTRUCTURALFEATUREACTION_P_H -#define QUMLCLEARSTRUCTURALFEATUREACTION_P_H - -#include "QtUml/QUmlClearStructuralFeatureAction" - -#include "private/qumlstructuralfeatureaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlClearStructuralFeatureActionPrivate : public QUmlStructuralFeatureActionPrivate -{ -public: - QUmlClearStructuralFeatureActionPrivate(); - - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCLEARSTRUCTURALFEATUREACTION_P_H - diff --git a/src/uml/qumlclearvariableaction.cpp b/src/uml/qumlclearvariableaction.cpp index cad7e115..37ac8c58 100644 --- a/src/uml/qumlclearvariableaction.cpp +++ b/src/uml/qumlclearvariableaction.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlclearvariableaction.h" -#include "qumlclearvariableaction_p.h" QT_BEGIN_NAMESPACE -QUmlClearVariableActionPrivate::QUmlClearVariableActionPrivate() -{ -} - /*! \class QUmlClearVariableAction @@ -55,11 +50,8 @@ QUmlClearVariableActionPrivate::QUmlClearVariableActionPrivate() \brief A clear variable action is a variable action that removes all values of a variable. */ -QUmlClearVariableAction::QUmlClearVariableAction(bool create_d_ptr) : - QUmlVariableAction(false) +QUmlClearVariableAction::QUmlClearVariableAction() { - if (create_d_ptr) - set_d_ptr(new QUmlClearVariableActionPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlclearvariableaction.h b/src/uml/qumlclearvariableaction.h index 859e6ea1..b9fedb1d 100644 --- a/src/uml/qumlclearvariableaction.h +++ b/src/uml/qumlclearvariableaction.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlClearVariableActionPrivate; class Q_UML_EXPORT QUmlClearVariableAction : public QUmlVariableAction { public: - QUmlClearVariableAction(bool create_d_ptr = true); + QUmlClearVariableAction(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlclearvariableaction_p.h b/src/uml/qumlclearvariableaction_p.h deleted file mode 100644 index 0f44fe95..00000000 --- a/src/uml/qumlclearvariableaction_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCLEARVARIABLEACTION_P_H -#define QUMLCLEARVARIABLEACTION_P_H - -#include "QtUml/QUmlClearVariableAction" - -#include "private/qumlvariableaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlClearVariableActionPrivate : public QUmlVariableActionPrivate -{ -public: - QUmlClearVariableActionPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCLEARVARIABLEACTION_P_H - diff --git a/src/uml/qumlcollaboration.cpp b/src/uml/qumlcollaboration.cpp index d21d4325..f78f4922 100644 --- a/src/uml/qumlcollaboration.cpp +++ b/src/uml/qumlcollaboration.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlcollaboration.h" -#include "qumlcollaboration_p.h" #include <QtUml/QUmlConnectableElement> QT_BEGIN_NAMESPACE -QUmlCollaborationPrivate::QUmlCollaborationPrivate() -{ -} - /*! \class QUmlCollaboration @@ -57,12 +52,8 @@ QUmlCollaborationPrivate::QUmlCollaborationPrivate() \brief A collaboration use represents the application of the pattern described by a collaboration to a specific situation involving specific classes or instances playing the roles of the collaboration. */ -QUmlCollaboration::QUmlCollaboration(bool create_d_ptr) : - QUmlStructuredClassifier(false), - QUmlBehavioredClassifier(false) +QUmlCollaboration::QUmlCollaboration() { - if (create_d_ptr) - set_d_ptr(new QUmlCollaborationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +65,15 @@ QSet<QUmlConnectableElement *> QUmlCollaboration::collaborationRole() const { // This is a read-write association end - QM_D(const QUmlCollaboration); - return d->collaborationRole; + return _collaborationRole; } void QUmlCollaboration::addCollaborationRole(QUmlConnectableElement *collaborationRole) { // This is a read-write association end - QM_D(QUmlCollaboration); - if (!d->collaborationRole.contains(collaborationRole)) { - d->collaborationRole.insert(collaborationRole); + if (!_collaborationRole.contains(collaborationRole)) { + _collaborationRole.insert(collaborationRole); } } @@ -92,9 +81,8 @@ void QUmlCollaboration::removeCollaborationRole(QUmlConnectableElement *collabor { // This is a read-write association end - QM_D(QUmlCollaboration); - if (d->collaborationRole.contains(collaborationRole)) { - d->collaborationRole.remove(collaborationRole); + if (_collaborationRole.contains(collaborationRole)) { + _collaborationRole.remove(collaborationRole); } } diff --git a/src/uml/qumlcollaboration.h b/src/uml/qumlcollaboration.h index cbf95817..eae9b32e 100644 --- a/src/uml/qumlcollaboration.h +++ b/src/uml/qumlcollaboration.h @@ -54,16 +54,18 @@ QT_MODULE(QtUml) class QUmlConnectableElement; -class QUmlCollaborationPrivate; class Q_UML_EXPORT QUmlCollaboration : public QUmlStructuredClassifier, public QUmlBehavioredClassifier { public: - QUmlCollaboration(bool create_d_ptr = true); + QUmlCollaboration(); // Owned attributes QSet<QUmlConnectableElement *> collaborationRole() const; void addCollaborationRole(QUmlConnectableElement *collaborationRole); void removeCollaborationRole(QUmlConnectableElement *collaborationRole); + +protected: + QSet<QUmlConnectableElement *> _collaborationRole; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcollaboration_p.h b/src/uml/qumlcollaboration_p.h deleted file mode 100644 index c36c0ac1..00000000 --- a/src/uml/qumlcollaboration_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCOLLABORATION_P_H -#define QUMLCOLLABORATION_P_H - -#include "QtUml/QUmlCollaboration" - -#include "private/qumlstructuredclassifier_p.h" -#include "private/qumlbehavioredclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCollaborationPrivate : public QUmlStructuredClassifierPrivate, public QUmlBehavioredClassifierPrivate -{ -public: - QUmlCollaborationPrivate(); - - QSet<QUmlConnectableElement *> collaborationRole; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCOLLABORATION_P_H - diff --git a/src/uml/qumlcollaborationuse.cpp b/src/uml/qumlcollaborationuse.cpp index f48057d2..34bca962 100644 --- a/src/uml/qumlcollaborationuse.cpp +++ b/src/uml/qumlcollaborationuse.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlcollaborationuse.h" -#include "qumlcollaborationuse_p.h" #include <QtUml/QUmlCollaboration> #include <QtUml/QUmlDependency> QT_BEGIN_NAMESPACE -QUmlCollaborationUsePrivate::QUmlCollaborationUsePrivate() : - type(0) -{ -} - /*! \class QUmlCollaborationUse @@ -59,11 +53,9 @@ QUmlCollaborationUsePrivate::QUmlCollaborationUsePrivate() : \brief A collaboration use represents one particular use of a collaboration to explain the relationships between the properties of a classifier. A collaboration use shows how the pattern described by a collaboration is applied in a given context, by binding specific entities from that context to the roles of the collaboration. Depending on the context, these entities could be structural features of a classifier, instance specifications, or even roles in some containing collaboration. There may be multiple occurrences of a given collaboration within a classifier, each involving a different set of roles and connectors. A given role or connector may be involved in multiple occurrences of the same or different collaborations. Associated dependencies map features of the collaboration type to features in the classifier. These dependencies indicate which role in the classifier plays which role in the collaboration. */ -QUmlCollaborationUse::QUmlCollaborationUse(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlCollaborationUse::QUmlCollaborationUse() : + _type(0) { - if (create_d_ptr) - set_d_ptr(new QUmlCollaborationUsePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QSet<QUmlDependency *> QUmlCollaborationUse::roleBinding() const { // This is a read-write association end - QM_D(const QUmlCollaborationUse); - return d->roleBinding; + return _roleBinding; } void QUmlCollaborationUse::addRoleBinding(QUmlDependency *roleBinding) { // This is a read-write association end - QM_D(QUmlCollaborationUse); - if (!d->roleBinding.contains(roleBinding)) { - d->roleBinding.insert(roleBinding); + if (!_roleBinding.contains(roleBinding)) { + _roleBinding.insert(roleBinding); } } @@ -93,9 +83,8 @@ void QUmlCollaborationUse::removeRoleBinding(QUmlDependency *roleBinding) { // This is a read-write association end - QM_D(QUmlCollaborationUse); - if (d->roleBinding.contains(roleBinding)) { - d->roleBinding.remove(roleBinding); + if (_roleBinding.contains(roleBinding)) { + _roleBinding.remove(roleBinding); } } @@ -106,17 +95,15 @@ QUmlCollaboration *QUmlCollaborationUse::type() const { // This is a read-write association end - QM_D(const QUmlCollaborationUse); - return d->type; + return _type; } void QUmlCollaborationUse::setType(QUmlCollaboration *type) { // This is a read-write association end - QM_D(QUmlCollaborationUse); - if (d->type != type) { - d->type = type; + if (_type != type) { + _type = type; } } diff --git a/src/uml/qumlcollaborationuse.h b/src/uml/qumlcollaborationuse.h index bf289da0..27ba187c 100644 --- a/src/uml/qumlcollaborationuse.h +++ b/src/uml/qumlcollaborationuse.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlCollaboration; class QUmlDependency; -class QUmlCollaborationUsePrivate; class Q_UML_EXPORT QUmlCollaborationUse : public QUmlNamedElement { public: - QUmlCollaborationUse(bool create_d_ptr = true); + QUmlCollaborationUse(); // Owned attributes QSet<QUmlDependency *> roleBinding() const; @@ -66,6 +65,10 @@ public: void removeRoleBinding(QUmlDependency *roleBinding); QUmlCollaboration *type() const; void setType(QUmlCollaboration *type); + +protected: + QSet<QUmlDependency *> _roleBinding; + QUmlCollaboration *_type; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcollaborationuse_p.h b/src/uml/qumlcollaborationuse_p.h deleted file mode 100644 index 1a338b71..00000000 --- a/src/uml/qumlcollaborationuse_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCOLLABORATIONUSE_P_H -#define QUMLCOLLABORATIONUSE_P_H - -#include "QtUml/QUmlCollaborationUse" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCollaborationUsePrivate : public QUmlNamedElementPrivate -{ -public: - QUmlCollaborationUsePrivate(); - - QSet<QUmlDependency *> roleBinding; - QUmlCollaboration *type; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCOLLABORATIONUSE_P_H - diff --git a/src/uml/qumlcombinedfragment.cpp b/src/uml/qumlcombinedfragment.cpp index ec831ff2..b258cde7 100644 --- a/src/uml/qumlcombinedfragment.cpp +++ b/src/uml/qumlcombinedfragment.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlcombinedfragment.h" -#include "qumlcombinedfragment_p.h" #include <QtUml/QUmlGate> #include <QtUml/QUmlInteractionOperand> QT_BEGIN_NAMESPACE -QUmlCombinedFragmentPrivate::QUmlCombinedFragmentPrivate() : - interactionOperator(QtUml::InteractionOperatorSeq) -{ -} - /*! \class QUmlCombinedFragment @@ -59,11 +53,9 @@ QUmlCombinedFragmentPrivate::QUmlCombinedFragmentPrivate() : \brief A combined fragment defines an expression of interaction fragments. A combined fragment is defined by an interaction operator and corresponding interaction operands. Through the use of combined fragments the user will be able to describe a number of traces in a compact and concise manner. */ -QUmlCombinedFragment::QUmlCombinedFragment(bool create_d_ptr) : - QUmlInteractionFragment(false) +QUmlCombinedFragment::QUmlCombinedFragment() : + _interactionOperator(QtUml::InteractionOperatorSeq) { - if (create_d_ptr) - set_d_ptr(new QUmlCombinedFragmentPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QSet<QUmlGate *> QUmlCombinedFragment::cfragmentGate() const { // This is a read-write association end - QM_D(const QUmlCombinedFragment); - return d->cfragmentGate; + return _cfragmentGate; } void QUmlCombinedFragment::addCfragmentGate(QUmlGate *cfragmentGate) { // This is a read-write association end - QM_D(QUmlCombinedFragment); - if (!d->cfragmentGate.contains(cfragmentGate)) { - d->cfragmentGate.insert(cfragmentGate); + if (!_cfragmentGate.contains(cfragmentGate)) { + _cfragmentGate.insert(cfragmentGate); } } @@ -93,9 +83,8 @@ void QUmlCombinedFragment::removeCfragmentGate(QUmlGate *cfragmentGate) { // This is a read-write association end - QM_D(QUmlCombinedFragment); - if (d->cfragmentGate.contains(cfragmentGate)) { - d->cfragmentGate.remove(cfragmentGate); + if (_cfragmentGate.contains(cfragmentGate)) { + _cfragmentGate.remove(cfragmentGate); } } @@ -106,17 +95,15 @@ QtUml::InteractionOperatorKind QUmlCombinedFragment::interactionOperator() const { // This is a read-write property - QM_D(const QUmlCombinedFragment); - return d->interactionOperator; + return _interactionOperator; } void QUmlCombinedFragment::setInteractionOperator(QtUml::InteractionOperatorKind interactionOperator) { // This is a read-write property - QM_D(QUmlCombinedFragment); - if (d->interactionOperator != interactionOperator) { - d->interactionOperator = interactionOperator; + if (_interactionOperator != interactionOperator) { + _interactionOperator = interactionOperator; } } @@ -127,17 +114,15 @@ QList<QUmlInteractionOperand *> QUmlCombinedFragment::operand() const { // This is a read-write association end - QM_D(const QUmlCombinedFragment); - return d->operand; + return _operand; } void QUmlCombinedFragment::addOperand(QUmlInteractionOperand *operand) { // This is a read-write association end - QM_D(QUmlCombinedFragment); - if (!d->operand.contains(operand)) { - d->operand.append(operand); + if (!_operand.contains(operand)) { + _operand.append(operand); } } @@ -145,9 +130,8 @@ void QUmlCombinedFragment::removeOperand(QUmlInteractionOperand *operand) { // This is a read-write association end - QM_D(QUmlCombinedFragment); - if (d->operand.contains(operand)) { - d->operand.removeAll(operand); + if (_operand.contains(operand)) { + _operand.removeAll(operand); } } diff --git a/src/uml/qumlcombinedfragment.h b/src/uml/qumlcombinedfragment.h index 6f0f08b5..02eb6b62 100644 --- a/src/uml/qumlcombinedfragment.h +++ b/src/uml/qumlcombinedfragment.h @@ -55,11 +55,10 @@ QT_MODULE(QtUml) class QUmlGate; class QUmlInteractionOperand; -class QUmlCombinedFragmentPrivate; class Q_UML_EXPORT QUmlCombinedFragment : public QUmlInteractionFragment { public: - QUmlCombinedFragment(bool create_d_ptr = true); + QUmlCombinedFragment(); // Owned attributes QSet<QUmlGate *> cfragmentGate() const; @@ -70,6 +69,11 @@ public: 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 diff --git a/src/uml/qumlcombinedfragment_p.h b/src/uml/qumlcombinedfragment_p.h deleted file mode 100644 index a158830d..00000000 --- a/src/uml/qumlcombinedfragment_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCOMBINEDFRAGMENT_P_H -#define QUMLCOMBINEDFRAGMENT_P_H - -#include "QtUml/QUmlCombinedFragment" - -#include "private/qumlinteractionfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCombinedFragmentPrivate : public QUmlInteractionFragmentPrivate -{ -public: - QUmlCombinedFragmentPrivate(); - - QSet<QUmlGate *> cfragmentGate; - QtUml::InteractionOperatorKind interactionOperator; - QList<QUmlInteractionOperand *> operand; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCOMBINEDFRAGMENT_P_H - diff --git a/src/uml/qumlcomment.cpp b/src/uml/qumlcomment.cpp index 813bc370..132b8665 100644 --- a/src/uml/qumlcomment.cpp +++ b/src/uml/qumlcomment.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlcomment.h" -#include "qumlcomment_p.h" QT_BEGIN_NAMESPACE -QUmlCommentPrivate::QUmlCommentPrivate() -{ -} - /*! \class QUmlComment @@ -55,11 +50,8 @@ QUmlCommentPrivate::QUmlCommentPrivate() \brief A comment is a textual annotation that can be attached to a set of elements. */ -QUmlComment::QUmlComment(bool create_d_ptr) : - QUmlElement(false) +QUmlComment::QUmlComment() { - if (create_d_ptr) - set_d_ptr(new QUmlCommentPrivate); } // OWNED ATTRIBUTES @@ -71,17 +63,15 @@ QSet<QUmlElement *> QUmlComment::annotatedElement() const { // This is a read-write association end - QM_D(const QUmlComment); - return d->annotatedElement; + return _annotatedElement; } void QUmlComment::addAnnotatedElement(QUmlElement *annotatedElement) { // This is a read-write association end - QM_D(QUmlComment); - if (!d->annotatedElement.contains(annotatedElement)) { - d->annotatedElement.insert(annotatedElement); + if (!_annotatedElement.contains(annotatedElement)) { + _annotatedElement.insert(annotatedElement); } } @@ -89,9 +79,8 @@ void QUmlComment::removeAnnotatedElement(QUmlElement *annotatedElement) { // This is a read-write association end - QM_D(QUmlComment); - if (d->annotatedElement.contains(annotatedElement)) { - d->annotatedElement.remove(annotatedElement); + if (_annotatedElement.contains(annotatedElement)) { + _annotatedElement.remove(annotatedElement); } } @@ -102,17 +91,15 @@ QString QUmlComment::body() const { // This is a read-write property - QM_D(const QUmlComment); - return d->body; + return _body; } void QUmlComment::setBody(QString body) { // This is a read-write property - QM_D(QUmlComment); - if (d->body != body) { - d->body = body; + if (_body != body) { + _body = body; } } diff --git a/src/uml/qumlcomment.h b/src/uml/qumlcomment.h index df568eaf..48918d58 100644 --- a/src/uml/qumlcomment.h +++ b/src/uml/qumlcomment.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlCommentPrivate; class Q_UML_EXPORT QUmlComment : public QUmlElement { public: - QUmlComment(bool create_d_ptr = true); + QUmlComment(); // Owned attributes QSet<QUmlElement *> annotatedElement() const; @@ -63,6 +62,10 @@ public: void removeAnnotatedElement(QUmlElement *annotatedElement); QString body() const; void setBody(QString body); + +protected: + QSet<QUmlElement *> _annotatedElement; + QString _body; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcomment_p.h b/src/uml/qumlcomment_p.h deleted file mode 100644 index deebc30e..00000000 --- a/src/uml/qumlcomment_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCOMMENT_P_H -#define QUMLCOMMENT_P_H - -#include "QtUml/QUmlComment" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCommentPrivate : public QUmlElementPrivate -{ -public: - QUmlCommentPrivate(); - - QSet<QUmlElement *> annotatedElement; - QString body; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCOMMENT_P_H - diff --git a/src/uml/qumlcommunicationpath.cpp b/src/uml/qumlcommunicationpath.cpp index a99f1ffc..94230223 100644 --- a/src/uml/qumlcommunicationpath.cpp +++ b/src/uml/qumlcommunicationpath.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlcommunicationpath.h" -#include "qumlcommunicationpath_p.h" QT_BEGIN_NAMESPACE -QUmlCommunicationPathPrivate::QUmlCommunicationPathPrivate() -{ -} - /*! \class QUmlCommunicationPath @@ -55,11 +50,8 @@ QUmlCommunicationPathPrivate::QUmlCommunicationPathPrivate() \brief A communication path is an association between two deployment targets, through which they are able to exchange signals and messages. */ -QUmlCommunicationPath::QUmlCommunicationPath(bool create_d_ptr) : - QUmlAssociation(false) +QUmlCommunicationPath::QUmlCommunicationPath() { - if (create_d_ptr) - set_d_ptr(new QUmlCommunicationPathPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlcommunicationpath.h b/src/uml/qumlcommunicationpath.h index 570e79eb..cd823580 100644 --- a/src/uml/qumlcommunicationpath.h +++ b/src/uml/qumlcommunicationpath.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlCommunicationPathPrivate; class Q_UML_EXPORT QUmlCommunicationPath : public QUmlAssociation { public: - QUmlCommunicationPath(bool create_d_ptr = true); + QUmlCommunicationPath(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlcommunicationpath_p.h b/src/uml/qumlcommunicationpath_p.h deleted file mode 100644 index 633db1ed..00000000 --- a/src/uml/qumlcommunicationpath_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCOMMUNICATIONPATH_P_H -#define QUMLCOMMUNICATIONPATH_P_H - -#include "QtUml/QUmlCommunicationPath" - -#include "private/qumlassociation_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCommunicationPathPrivate : public QUmlAssociationPrivate -{ -public: - QUmlCommunicationPathPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCOMMUNICATIONPATH_P_H - diff --git a/src/uml/qumlcomponent.cpp b/src/uml/qumlcomponent.cpp index 25333544..bb8810ff 100644 --- a/src/uml/qumlcomponent.cpp +++ b/src/uml/qumlcomponent.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlcomponent.h" -#include "qumlcomponent_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlComponentRealization> @@ -48,11 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlComponentPrivate::QUmlComponentPrivate() : - isIndirectlyInstantiated(true) -{ -} - /*! \class QUmlComponent @@ -61,11 +55,9 @@ QUmlComponentPrivate::QUmlComponentPrivate() : \brief In the namespace of a component, all model elements that are involved in or related to its definition are either owned or imported explicitly. This may include, for example, use cases and dependencies (e.g. mappings), packages, components, and artifacts.A component represents a modular part of a system that encapsulates its contents and whose manifestation is replaceable within its environment. */ -QUmlComponent::QUmlComponent(bool create_d_ptr) : - QUmlClass(false) +QUmlComponent::QUmlComponent() : + _isIndirectlyInstantiated(true) { - if (create_d_ptr) - set_d_ptr(new QUmlComponentPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ bool QUmlComponent::isIndirectlyInstantiated() const { // This is a read-write property - QM_D(const QUmlComponent); - return d->isIndirectlyInstantiated; + return _isIndirectlyInstantiated; } void QUmlComponent::setIndirectlyInstantiated(bool isIndirectlyInstantiated) { // This is a read-write property - QM_D(QUmlComponent); - if (d->isIndirectlyInstantiated != isIndirectlyInstantiated) { - d->isIndirectlyInstantiated = isIndirectlyInstantiated; + if (_isIndirectlyInstantiated != isIndirectlyInstantiated) { + _isIndirectlyInstantiated = isIndirectlyInstantiated; } } @@ -98,17 +88,15 @@ QSet<QUmlPackageableElement *> QUmlComponent::packagedElement() const { // This is a read-write association end - QM_D(const QUmlComponent); - return d->packagedElement; + return _packagedElement; } void QUmlComponent::addPackagedElement(QUmlPackageableElement *packagedElement) { // This is a read-write association end - QM_D(QUmlComponent); - if (!d->packagedElement.contains(packagedElement)) { - d->packagedElement.insert(packagedElement); + if (!_packagedElement.contains(packagedElement)) { + _packagedElement.insert(packagedElement); } } @@ -116,9 +104,8 @@ void QUmlComponent::removePackagedElement(QUmlPackageableElement *packagedElemen { // This is a read-write association end - QM_D(QUmlComponent); - if (d->packagedElement.contains(packagedElement)) { - d->packagedElement.remove(packagedElement); + if (_packagedElement.contains(packagedElement)) { + _packagedElement.remove(packagedElement); } } @@ -141,17 +128,15 @@ QSet<QUmlComponentRealization *> QUmlComponent::realization() const { // This is a read-write association end - QM_D(const QUmlComponent); - return d->realization; + return _realization; } void QUmlComponent::addRealization(QUmlComponentRealization *realization) { // This is a read-write association end - QM_D(QUmlComponent); - if (!d->realization.contains(realization)) { - d->realization.insert(realization); + if (!_realization.contains(realization)) { + _realization.insert(realization); } } @@ -159,9 +144,8 @@ void QUmlComponent::removeRealization(QUmlComponentRealization *realization) { // This is a read-write association end - QM_D(QUmlComponent); - if (d->realization.contains(realization)) { - d->realization.remove(realization); + if (_realization.contains(realization)) { + _realization.remove(realization); } } diff --git a/src/uml/qumlcomponent.h b/src/uml/qumlcomponent.h index a516a84d..506e13ce 100644 --- a/src/uml/qumlcomponent.h +++ b/src/uml/qumlcomponent.h @@ -56,11 +56,10 @@ class QUmlComponentRealization; class QUmlInterface; class QUmlPackageableElement; -class QUmlComponentPrivate; class Q_UML_EXPORT QUmlComponent : public QUmlClass { public: - QUmlComponent(bool create_d_ptr = true); + QUmlComponent(); // Owned attributes bool isIndirectlyInstantiated() const; @@ -77,6 +76,11 @@ public: // Operations QSet<QUmlInterface *> realizedInterfaces(QUmlClassifier *classifier) const; QSet<QUmlInterface *> usedInterfaces(QUmlClassifier *classifier) const; + +protected: + bool _isIndirectlyInstantiated; + QSet<QUmlPackageableElement *> _packagedElement; + QSet<QUmlComponentRealization *> _realization; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcomponent_p.h b/src/uml/qumlcomponent_p.h deleted file mode 100644 index 6f3462e7..00000000 --- a/src/uml/qumlcomponent_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCOMPONENT_P_H -#define QUMLCOMPONENT_P_H - -#include "QtUml/QUmlComponent" - -#include "private/qumlclass_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlComponentPrivate : public QUmlClassPrivate -{ -public: - QUmlComponentPrivate(); - - bool isIndirectlyInstantiated; - QSet<QUmlPackageableElement *> packagedElement; - QSet<QUmlComponentRealization *> realization; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCOMPONENT_P_H - diff --git a/src/uml/qumlcomponentrealization.cpp b/src/uml/qumlcomponentrealization.cpp index 9f8ed316..f2b809ae 100644 --- a/src/uml/qumlcomponentrealization.cpp +++ b/src/uml/qumlcomponentrealization.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlcomponentrealization.h" -#include "qumlcomponentrealization_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlComponent> QT_BEGIN_NAMESPACE -QUmlComponentRealizationPrivate::QUmlComponentRealizationPrivate() : - abstraction(0) -{ -} - /*! \class QUmlComponentRealization @@ -59,11 +53,9 @@ QUmlComponentRealizationPrivate::QUmlComponentRealizationPrivate() : \brief The realization concept is specialized to (optionally) define the classifiers that realize the contract offered by a component in terms of its provided and required interfaces. The component forms an abstraction from these various classifiers. */ -QUmlComponentRealization::QUmlComponentRealization(bool create_d_ptr) : - QUmlRealization(false) +QUmlComponentRealization::QUmlComponentRealization() : + _abstraction(0) { - if (create_d_ptr) - set_d_ptr(new QUmlComponentRealizationPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlComponent *QUmlComponentRealization::abstraction() const { // This is a read-write association end - QM_D(const QUmlComponentRealization); - return d->abstraction; + return _abstraction; } void QUmlComponentRealization::setAbstraction(QUmlComponent *abstraction) { // This is a read-write association end - QM_D(QUmlComponentRealization); - if (d->abstraction != abstraction) { - d->abstraction = abstraction; + if (_abstraction != abstraction) { + _abstraction = abstraction; } } @@ -96,17 +86,15 @@ QSet<QUmlClassifier *> QUmlComponentRealization::realizingClassifier() const { // This is a read-write association end - QM_D(const QUmlComponentRealization); - return d->realizingClassifier; + return _realizingClassifier; } void QUmlComponentRealization::addRealizingClassifier(QUmlClassifier *realizingClassifier) { // This is a read-write association end - QM_D(QUmlComponentRealization); - if (!d->realizingClassifier.contains(realizingClassifier)) { - d->realizingClassifier.insert(realizingClassifier); + if (!_realizingClassifier.contains(realizingClassifier)) { + _realizingClassifier.insert(realizingClassifier); } } @@ -114,9 +102,8 @@ void QUmlComponentRealization::removeRealizingClassifier(QUmlClassifier *realizi { // This is a read-write association end - QM_D(QUmlComponentRealization); - if (d->realizingClassifier.contains(realizingClassifier)) { - d->realizingClassifier.remove(realizingClassifier); + if (_realizingClassifier.contains(realizingClassifier)) { + _realizingClassifier.remove(realizingClassifier); } } diff --git a/src/uml/qumlcomponentrealization.h b/src/uml/qumlcomponentrealization.h index 0c4cbac4..1b670770 100644 --- a/src/uml/qumlcomponentrealization.h +++ b/src/uml/qumlcomponentrealization.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlClassifier; class QUmlComponent; -class QUmlComponentRealizationPrivate; class Q_UML_EXPORT QUmlComponentRealization : public QUmlRealization { public: - QUmlComponentRealization(bool create_d_ptr = true); + QUmlComponentRealization(); // Owned attributes QUmlComponent *abstraction() const; @@ -66,6 +65,10 @@ public: QSet<QUmlClassifier *> realizingClassifier() const; void addRealizingClassifier(QUmlClassifier *realizingClassifier); void removeRealizingClassifier(QUmlClassifier *realizingClassifier); + +protected: + QUmlComponent *_abstraction; + QSet<QUmlClassifier *> _realizingClassifier; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcomponentrealization_p.h b/src/uml/qumlcomponentrealization_p.h deleted file mode 100644 index d5b5f461..00000000 --- a/src/uml/qumlcomponentrealization_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCOMPONENTREALIZATION_P_H -#define QUMLCOMPONENTREALIZATION_P_H - -#include "QtUml/QUmlComponentRealization" - -#include "private/qumlrealization_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlComponentRealizationPrivate : public QUmlRealizationPrivate -{ -public: - QUmlComponentRealizationPrivate(); - - QUmlComponent *abstraction; - QSet<QUmlClassifier *> realizingClassifier; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCOMPONENTREALIZATION_P_H - diff --git a/src/uml/qumlconditionalnode.cpp b/src/uml/qumlconditionalnode.cpp index f7c50ec0..7ef2618e 100644 --- a/src/uml/qumlconditionalnode.cpp +++ b/src/uml/qumlconditionalnode.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlconditionalnode.h" -#include "qumlconditionalnode_p.h" #include <QtUml/QUmlClause> #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlConditionalNodePrivate::QUmlConditionalNodePrivate() : - isAssured(false), - isDeterminate(false) -{ -} - /*! \class QUmlConditionalNode @@ -60,11 +53,10 @@ QUmlConditionalNodePrivate::QUmlConditionalNodePrivate() : \brief A conditional node is a structured activity node that represents an exclusive choice among some number of alternatives. */ -QUmlConditionalNode::QUmlConditionalNode(bool create_d_ptr) : - QUmlStructuredActivityNode(false) +QUmlConditionalNode::QUmlConditionalNode() : + _isAssured(false), + _isDeterminate(false) { - if (create_d_ptr) - set_d_ptr(new QUmlConditionalNodePrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QSet<QUmlClause *> QUmlConditionalNode::clause() const { // This is a read-write association end - QM_D(const QUmlConditionalNode); - return d->clause; + return _clause; } void QUmlConditionalNode::addClause(QUmlClause *clause) { // This is a read-write association end - QM_D(QUmlConditionalNode); - if (!d->clause.contains(clause)) { - d->clause.insert(clause); + if (!_clause.contains(clause)) { + _clause.insert(clause); } } @@ -94,9 +84,8 @@ void QUmlConditionalNode::removeClause(QUmlClause *clause) { // This is a read-write association end - QM_D(QUmlConditionalNode); - if (d->clause.contains(clause)) { - d->clause.remove(clause); + if (_clause.contains(clause)) { + _clause.remove(clause); } } @@ -107,17 +96,15 @@ bool QUmlConditionalNode::isAssured() const { // This is a read-write property - QM_D(const QUmlConditionalNode); - return d->isAssured; + return _isAssured; } void QUmlConditionalNode::setAssured(bool isAssured) { // This is a read-write property - QM_D(QUmlConditionalNode); - if (d->isAssured != isAssured) { - d->isAssured = isAssured; + if (_isAssured != isAssured) { + _isAssured = isAssured; } } @@ -128,17 +115,15 @@ bool QUmlConditionalNode::isDeterminate() const { // This is a read-write property - QM_D(const QUmlConditionalNode); - return d->isDeterminate; + return _isDeterminate; } void QUmlConditionalNode::setDeterminate(bool isDeterminate) { // This is a read-write property - QM_D(QUmlConditionalNode); - if (d->isDeterminate != isDeterminate) { - d->isDeterminate = isDeterminate; + if (_isDeterminate != isDeterminate) { + _isDeterminate = isDeterminate; } } @@ -149,17 +134,15 @@ QList<QUmlOutputPin *> QUmlConditionalNode::result() const { // This is a read-write association end - QM_D(const QUmlConditionalNode); - return d->result; + return _result; } void QUmlConditionalNode::addResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlConditionalNode); - if (!d->result.contains(result)) { - d->result.append(result); + if (!_result.contains(result)) { + _result.append(result); } } @@ -167,9 +150,8 @@ void QUmlConditionalNode::removeResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlConditionalNode); - if (d->result.contains(result)) { - d->result.removeAll(result); + if (_result.contains(result)) { + _result.removeAll(result); } } diff --git a/src/uml/qumlconditionalnode.h b/src/uml/qumlconditionalnode.h index 07a27192..934aa7da 100644 --- a/src/uml/qumlconditionalnode.h +++ b/src/uml/qumlconditionalnode.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlClause; class QUmlOutputPin; -class QUmlConditionalNodePrivate; class Q_UML_EXPORT QUmlConditionalNode : public QUmlStructuredActivityNode { public: - QUmlConditionalNode(bool create_d_ptr = true); + QUmlConditionalNode(); // Owned attributes QSet<QUmlClause *> clause() const; @@ -71,6 +70,12 @@ public: QList<QUmlOutputPin *> result() const; void addResult(QUmlOutputPin *result); void removeResult(QUmlOutputPin *result); + +protected: + QSet<QUmlClause *> _clause; + bool _isAssured; + bool _isDeterminate; + QList<QUmlOutputPin *> _result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconditionalnode_p.h b/src/uml/qumlconditionalnode_p.h deleted file mode 100644 index 5136aefe..00000000 --- a/src/uml/qumlconditionalnode_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONDITIONALNODE_P_H -#define QUMLCONDITIONALNODE_P_H - -#include "QtUml/QUmlConditionalNode" - -#include "private/qumlstructuredactivitynode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConditionalNodePrivate : public QUmlStructuredActivityNodePrivate -{ -public: - QUmlConditionalNodePrivate(); - - QSet<QUmlClause *> clause; - bool isAssured; - bool isDeterminate; - QList<QUmlOutputPin *> result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONDITIONALNODE_P_H - diff --git a/src/uml/qumlconnectableelement.cpp b/src/uml/qumlconnectableelement.cpp index 259f7a25..07402907 100644 --- a/src/uml/qumlconnectableelement.cpp +++ b/src/uml/qumlconnectableelement.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlconnectableelement.h" -#include "qumlconnectableelement_p.h" #include <QtUml/QUmlConnectableElementTemplateParameter> #include <QtUml/QUmlConnectorEnd> QT_BEGIN_NAMESPACE -QUmlConnectableElementPrivate::QUmlConnectableElementPrivate() : - templateParameter(0) -{ -} - /*! \class QUmlConnectableElement @@ -59,12 +53,9 @@ QUmlConnectableElementPrivate::QUmlConnectableElementPrivate() : \brief ConnectableElement is an abstract metaclass representing a set of instances that play roles of a classifier. Connectable elements may be joined by attached connectors and specify configurations of linked instances to be created within an instance of the containing classifier.A connectable element may be exposed as a connectable element template parameter. */ -QUmlConnectableElement::QUmlConnectableElement(bool create_d_ptr) : - QUmlTypedElement(false), - QUmlParameterableElement(false) +QUmlConnectableElement::QUmlConnectableElement() : + _templateParameter(0) { - if (create_d_ptr) - set_d_ptr(new QUmlConnectableElementPrivate); } // OWNED ATTRIBUTES @@ -88,17 +79,15 @@ QUmlConnectableElementTemplateParameter *QUmlConnectableElement::templateParamet { // This is a read-write association end - QM_D(const QUmlConnectableElement); - return d->templateParameter; + return _templateParameter; } void QUmlConnectableElement::setTemplateParameter(QUmlConnectableElementTemplateParameter *templateParameter) { // This is a read-write association end - QM_D(QUmlConnectableElement); - if (d->templateParameter != templateParameter) { - d->templateParameter = templateParameter; + if (_templateParameter != templateParameter) { + _templateParameter = templateParameter; } } diff --git a/src/uml/qumlconnectableelement.h b/src/uml/qumlconnectableelement.h index 13665748..79fee9ad 100644 --- a/src/uml/qumlconnectableelement.h +++ b/src/uml/qumlconnectableelement.h @@ -55,16 +55,18 @@ QT_MODULE(QtUml) class QUmlConnectableElementTemplateParameter; class QUmlConnectorEnd; -class QUmlConnectableElementPrivate; class Q_UML_EXPORT QUmlConnectableElement : public virtual QUmlTypedElement, public QUmlParameterableElement { public: - Q_DECL_HIDDEN QUmlConnectableElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlConnectableElement(); // Owned attributes QList<QUmlConnectorEnd *> end() const; QUmlConnectableElementTemplateParameter *templateParameter() const; void setTemplateParameter(QUmlConnectableElementTemplateParameter *templateParameter); + +protected: + QUmlConnectableElementTemplateParameter *_templateParameter; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconnectableelement_p.h b/src/uml/qumlconnectableelement_p.h deleted file mode 100644 index aeeaeb65..00000000 --- a/src/uml/qumlconnectableelement_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONNECTABLEELEMENT_P_H -#define QUMLCONNECTABLEELEMENT_P_H - -#include "QtUml/QUmlConnectableElement" - -#include "private/qumltypedelement_p.h" -#include "private/qumlparameterableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConnectableElementPrivate : public virtual QUmlTypedElementPrivate, public QUmlParameterableElementPrivate -{ -public: - QUmlConnectableElementPrivate(); - - QUmlConnectableElementTemplateParameter *templateParameter; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONNECTABLEELEMENT_P_H - diff --git a/src/uml/qumlconnectableelementtemplateparameter.cpp b/src/uml/qumlconnectableelementtemplateparameter.cpp index 1636d31c..8a65f867 100644 --- a/src/uml/qumlconnectableelementtemplateparameter.cpp +++ b/src/uml/qumlconnectableelementtemplateparameter.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlconnectableelementtemplateparameter.h" -#include "qumlconnectableelementtemplateparameter_p.h" #include <QtUml/QUmlConnectableElement> QT_BEGIN_NAMESPACE -QUmlConnectableElementTemplateParameterPrivate::QUmlConnectableElementTemplateParameterPrivate() : - parameteredElement(0) -{ -} - /*! \class QUmlConnectableElementTemplateParameter @@ -58,11 +52,9 @@ QUmlConnectableElementTemplateParameterPrivate::QUmlConnectableElementTemplatePa \brief A connectable element template parameter exposes a connectable element as a formal parameter for a template. */ -QUmlConnectableElementTemplateParameter::QUmlConnectableElementTemplateParameter(bool create_d_ptr) : - QUmlTemplateParameter(false) +QUmlConnectableElementTemplateParameter::QUmlConnectableElementTemplateParameter() : + _parameteredElement(0) { - if (create_d_ptr) - set_d_ptr(new QUmlConnectableElementTemplateParameterPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlConnectableElement *QUmlConnectableElementTemplateParameter::parameteredElem { // This is a read-write association end - QM_D(const QUmlConnectableElementTemplateParameter); - return d->parameteredElement; + return _parameteredElement; } void QUmlConnectableElementTemplateParameter::setParameteredElement(QUmlConnectableElement *parameteredElement) { // This is a read-write association end - QM_D(QUmlConnectableElementTemplateParameter); - if (d->parameteredElement != parameteredElement) { - d->parameteredElement = parameteredElement; + if (_parameteredElement != parameteredElement) { + _parameteredElement = parameteredElement; } } diff --git a/src/uml/qumlconnectableelementtemplateparameter.h b/src/uml/qumlconnectableelementtemplateparameter.h index 55698493..e2054d31 100644 --- a/src/uml/qumlconnectableelementtemplateparameter.h +++ b/src/uml/qumlconnectableelementtemplateparameter.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlConnectableElement; -class QUmlConnectableElementTemplateParameterPrivate; class Q_UML_EXPORT QUmlConnectableElementTemplateParameter : public QUmlTemplateParameter { public: - QUmlConnectableElementTemplateParameter(bool create_d_ptr = true); + QUmlConnectableElementTemplateParameter(); // Owned attributes QUmlConnectableElement *parameteredElement() const; void setParameteredElement(QUmlConnectableElement *parameteredElement); + +protected: + QUmlConnectableElement *_parameteredElement; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconnectableelementtemplateparameter_p.h b/src/uml/qumlconnectableelementtemplateparameter_p.h deleted file mode 100644 index e2f1ec4c..00000000 --- a/src/uml/qumlconnectableelementtemplateparameter_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONNECTABLEELEMENTTEMPLATEPARAMETER_P_H -#define QUMLCONNECTABLEELEMENTTEMPLATEPARAMETER_P_H - -#include "QtUml/QUmlConnectableElementTemplateParameter" - -#include "private/qumltemplateparameter_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConnectableElementTemplateParameterPrivate : public QUmlTemplateParameterPrivate -{ -public: - QUmlConnectableElementTemplateParameterPrivate(); - - QUmlConnectableElement *parameteredElement; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONNECTABLEELEMENTTEMPLATEPARAMETER_P_H - diff --git a/src/uml/qumlconnectionpointreference.cpp b/src/uml/qumlconnectionpointreference.cpp index f69950b0..e4ad5789 100644 --- a/src/uml/qumlconnectionpointreference.cpp +++ b/src/uml/qumlconnectionpointreference.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlconnectionpointreference.h" -#include "qumlconnectionpointreference_p.h" #include <QtUml/QUmlPseudostate> #include <QtUml/QUmlState> QT_BEGIN_NAMESPACE -QUmlConnectionPointReferencePrivate::QUmlConnectionPointReferencePrivate() : - state(0) -{ -} - /*! \class QUmlConnectionPointReference @@ -59,11 +53,9 @@ QUmlConnectionPointReferencePrivate::QUmlConnectionPointReferencePrivate() : \brief A connection point reference represents a usage (as part of a submachine state) of an entry/exit point defined in the statemachine reference by the submachine state. */ -QUmlConnectionPointReference::QUmlConnectionPointReference(bool create_d_ptr) : - QUmlVertex(false) +QUmlConnectionPointReference::QUmlConnectionPointReference() : + _state(0) { - if (create_d_ptr) - set_d_ptr(new QUmlConnectionPointReferencePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QSet<QUmlPseudostate *> QUmlConnectionPointReference::entry() const { // This is a read-write association end - QM_D(const QUmlConnectionPointReference); - return d->entry; + return _entry; } void QUmlConnectionPointReference::addEntry(QUmlPseudostate *entry) { // This is a read-write association end - QM_D(QUmlConnectionPointReference); - if (!d->entry.contains(entry)) { - d->entry.insert(entry); + if (!_entry.contains(entry)) { + _entry.insert(entry); } } @@ -93,9 +83,8 @@ void QUmlConnectionPointReference::removeEntry(QUmlPseudostate *entry) { // This is a read-write association end - QM_D(QUmlConnectionPointReference); - if (d->entry.contains(entry)) { - d->entry.remove(entry); + if (_entry.contains(entry)) { + _entry.remove(entry); } } @@ -106,17 +95,15 @@ QSet<QUmlPseudostate *> QUmlConnectionPointReference::exit() const { // This is a read-write association end - QM_D(const QUmlConnectionPointReference); - return d->exit; + return _exit; } void QUmlConnectionPointReference::addExit(QUmlPseudostate *exit) { // This is a read-write association end - QM_D(QUmlConnectionPointReference); - if (!d->exit.contains(exit)) { - d->exit.insert(exit); + if (!_exit.contains(exit)) { + _exit.insert(exit); } } @@ -124,9 +111,8 @@ void QUmlConnectionPointReference::removeExit(QUmlPseudostate *exit) { // This is a read-write association end - QM_D(QUmlConnectionPointReference); - if (d->exit.contains(exit)) { - d->exit.remove(exit); + if (_exit.contains(exit)) { + _exit.remove(exit); } } @@ -137,17 +123,15 @@ QUmlState *QUmlConnectionPointReference::state() const { // This is a read-write association end - QM_D(const QUmlConnectionPointReference); - return d->state; + return _state; } void QUmlConnectionPointReference::setState(QUmlState *state) { // This is a read-write association end - QM_D(QUmlConnectionPointReference); - if (d->state != state) { - d->state = state; + if (_state != state) { + _state = state; } } diff --git a/src/uml/qumlconnectionpointreference.h b/src/uml/qumlconnectionpointreference.h index b6dfcb49..38a79d20 100644 --- a/src/uml/qumlconnectionpointreference.h +++ b/src/uml/qumlconnectionpointreference.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlPseudostate; class QUmlState; -class QUmlConnectionPointReferencePrivate; class Q_UML_EXPORT QUmlConnectionPointReference : public QUmlVertex { public: - QUmlConnectionPointReference(bool create_d_ptr = true); + QUmlConnectionPointReference(); // Owned attributes QSet<QUmlPseudostate *> entry() const; @@ -69,6 +68,11 @@ public: void removeExit(QUmlPseudostate *exit); QUmlState *state() const; void setState(QUmlState *state); + +protected: + QSet<QUmlPseudostate *> _entry; + QSet<QUmlPseudostate *> _exit; + QUmlState *_state; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconnectionpointreference_p.h b/src/uml/qumlconnectionpointreference_p.h deleted file mode 100644 index a79c3ada..00000000 --- a/src/uml/qumlconnectionpointreference_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONNECTIONPOINTREFERENCE_P_H -#define QUMLCONNECTIONPOINTREFERENCE_P_H - -#include "QtUml/QUmlConnectionPointReference" - -#include "private/qumlvertex_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConnectionPointReferencePrivate : public QUmlVertexPrivate -{ -public: - QUmlConnectionPointReferencePrivate(); - - QSet<QUmlPseudostate *> entry; - QSet<QUmlPseudostate *> exit; - QUmlState *state; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONNECTIONPOINTREFERENCE_P_H - diff --git a/src/uml/qumlconnector.cpp b/src/uml/qumlconnector.cpp index 5ff99453..f3f0ce6b 100644 --- a/src/uml/qumlconnector.cpp +++ b/src/uml/qumlconnector.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlconnector.h" -#include "qumlconnector_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlBehavior> @@ -47,11 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlConnectorPrivate::QUmlConnectorPrivate() : - type(0) -{ -} - /*! \class QUmlConnector @@ -60,11 +54,9 @@ QUmlConnectorPrivate::QUmlConnectorPrivate() : \brief A delegation connector is a connector that links the external contract of a component (as specified by its ports) to the realization of that behavior. It represents the forwarding of events (operation requests and events): a signal that arrives at a port that has a delegation connector to one or more parts or ports on parts will be passed on to those targets for handling. An assembly connector is a connector between two or more parts or ports on parts that defines that one or more parts provide the services that other parts use.Specifies a link that enables communication between two or more instances. This link may be an instance of an association, or it may represent the possibility of the instances being able to communicate because their identities are known by virtue of being passed in as parameters, held in variables or slots, or because the communicating instances are the same instance. The link may be realized by something as simple as a pointer or by something as complex as a network connection. In contrast to associations, which specify links between any instance of the associated classifiers, connectors specify links between instances playing the connected parts only. */ -QUmlConnector::QUmlConnector(bool create_d_ptr) : - QUmlFeature(false) +QUmlConnector::QUmlConnector() : + _type(0) { - if (create_d_ptr) - set_d_ptr(new QUmlConnectorPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QSet<QUmlBehavior *> QUmlConnector::contract() const { // This is a read-write association end - QM_D(const QUmlConnector); - return d->contract; + return _contract; } void QUmlConnector::addContract(QUmlBehavior *contract) { // This is a read-write association end - QM_D(QUmlConnector); - if (!d->contract.contains(contract)) { - d->contract.insert(contract); + if (!_contract.contains(contract)) { + _contract.insert(contract); } } @@ -94,9 +84,8 @@ void QUmlConnector::removeContract(QUmlBehavior *contract) { // This is a read-write association end - QM_D(QUmlConnector); - if (d->contract.contains(contract)) { - d->contract.remove(contract); + if (_contract.contains(contract)) { + _contract.remove(contract); } } @@ -107,17 +96,15 @@ QList<QUmlConnectorEnd *> QUmlConnector::end() const { // This is a read-write association end - QM_D(const QUmlConnector); - return d->end; + return _end; } void QUmlConnector::addEnd(QUmlConnectorEnd *end) { // This is a read-write association end - QM_D(QUmlConnector); - if (!d->end.contains(end)) { - d->end.append(end); + if (!_end.contains(end)) { + _end.append(end); } } @@ -125,9 +112,8 @@ void QUmlConnector::removeEnd(QUmlConnectorEnd *end) { // This is a read-write association end - QM_D(QUmlConnector); - if (d->end.contains(end)) { - d->end.removeAll(end); + if (_end.contains(end)) { + _end.removeAll(end); } } @@ -150,17 +136,15 @@ QSet<QUmlConnector *> QUmlConnector::redefinedConnector() const { // This is a read-write association end - QM_D(const QUmlConnector); - return d->redefinedConnector; + return _redefinedConnector; } void QUmlConnector::addRedefinedConnector(QUmlConnector *redefinedConnector) { // This is a read-write association end - QM_D(QUmlConnector); - if (!d->redefinedConnector.contains(redefinedConnector)) { - d->redefinedConnector.insert(redefinedConnector); + if (!_redefinedConnector.contains(redefinedConnector)) { + _redefinedConnector.insert(redefinedConnector); } } @@ -168,9 +152,8 @@ void QUmlConnector::removeRedefinedConnector(QUmlConnector *redefinedConnector) { // This is a read-write association end - QM_D(QUmlConnector); - if (d->redefinedConnector.contains(redefinedConnector)) { - d->redefinedConnector.remove(redefinedConnector); + if (_redefinedConnector.contains(redefinedConnector)) { + _redefinedConnector.remove(redefinedConnector); } } @@ -181,17 +164,15 @@ QUmlAssociation *QUmlConnector::type() const { // This is a read-write association end - QM_D(const QUmlConnector); - return d->type; + return _type; } void QUmlConnector::setType(QUmlAssociation *type) { // This is a read-write association end - QM_D(QUmlConnector); - if (d->type != type) { - d->type = type; + if (_type != type) { + _type = type; } } diff --git a/src/uml/qumlconnector.h b/src/uml/qumlconnector.h index e0989322..a0e4fc9a 100644 --- a/src/uml/qumlconnector.h +++ b/src/uml/qumlconnector.h @@ -56,11 +56,10 @@ class QUmlAssociation; class QUmlBehavior; class QUmlConnectorEnd; -class QUmlConnectorPrivate; class Q_UML_EXPORT QUmlConnector : public QUmlFeature { public: - QUmlConnector(bool create_d_ptr = true); + QUmlConnector(); // Owned attributes QSet<QUmlBehavior *> contract() const; @@ -75,6 +74,12 @@ public: void removeRedefinedConnector(QUmlConnector *redefinedConnector); QUmlAssociation *type() const; void setType(QUmlAssociation *type); + +protected: + QSet<QUmlBehavior *> _contract; + QList<QUmlConnectorEnd *> _end; + QSet<QUmlConnector *> _redefinedConnector; + QUmlAssociation *_type; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconnector_p.h b/src/uml/qumlconnector_p.h deleted file mode 100644 index 00d69f41..00000000 --- a/src/uml/qumlconnector_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONNECTOR_P_H -#define QUMLCONNECTOR_P_H - -#include "QtUml/QUmlConnector" - -#include "private/qumlfeature_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConnectorPrivate : public QUmlFeaturePrivate -{ -public: - QUmlConnectorPrivate(); - - QSet<QUmlBehavior *> contract; - QList<QUmlConnectorEnd *> end; - QSet<QUmlConnector *> redefinedConnector; - QUmlAssociation *type; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONNECTOR_P_H - diff --git a/src/uml/qumlconnectorend.cpp b/src/uml/qumlconnectorend.cpp index e6109f7f..2e7e3584 100644 --- a/src/uml/qumlconnectorend.cpp +++ b/src/uml/qumlconnectorend.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlconnectorend.h" -#include "qumlconnectorend_p.h" #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlProperty> QT_BEGIN_NAMESPACE -QUmlConnectorEndPrivate::QUmlConnectorEndPrivate() : - partWithPort(0), - role(0) -{ -} - /*! \class QUmlConnectorEnd @@ -60,11 +53,10 @@ QUmlConnectorEndPrivate::QUmlConnectorEndPrivate() : \brief A connector end is an endpoint of a connector, which attaches the connector to a connectable element. Each connector end is part of one connector. */ -QUmlConnectorEnd::QUmlConnectorEnd(bool create_d_ptr) : - QUmlMultiplicityElement(false) +QUmlConnectorEnd::QUmlConnectorEnd() : + _partWithPort(0), + _role(0) { - if (create_d_ptr) - set_d_ptr(new QUmlConnectorEndPrivate); } // OWNED ATTRIBUTES @@ -88,17 +80,15 @@ QUmlProperty *QUmlConnectorEnd::partWithPort() const { // This is a read-write association end - QM_D(const QUmlConnectorEnd); - return d->partWithPort; + return _partWithPort; } void QUmlConnectorEnd::setPartWithPort(QUmlProperty *partWithPort) { // This is a read-write association end - QM_D(QUmlConnectorEnd); - if (d->partWithPort != partWithPort) { - d->partWithPort = partWithPort; + if (_partWithPort != partWithPort) { + _partWithPort = partWithPort; } } @@ -109,17 +99,15 @@ QUmlConnectableElement *QUmlConnectorEnd::role() const { // This is a read-write association end - QM_D(const QUmlConnectorEnd); - return d->role; + return _role; } void QUmlConnectorEnd::setRole(QUmlConnectableElement *role) { // This is a read-write association end - QM_D(QUmlConnectorEnd); - if (d->role != role) { - d->role = role; + if (_role != role) { + _role = role; } } diff --git a/src/uml/qumlconnectorend.h b/src/uml/qumlconnectorend.h index 5a6a86e6..2a347c69 100644 --- a/src/uml/qumlconnectorend.h +++ b/src/uml/qumlconnectorend.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlConnectableElement; class QUmlProperty; -class QUmlConnectorEndPrivate; class Q_UML_EXPORT QUmlConnectorEnd : public QUmlMultiplicityElement { public: - QUmlConnectorEnd(bool create_d_ptr = true); + QUmlConnectorEnd(); // Owned attributes QUmlProperty *definingEnd() const; @@ -66,6 +65,10 @@ public: void setPartWithPort(QUmlProperty *partWithPort); QUmlConnectableElement *role() const; void setRole(QUmlConnectableElement *role); + +protected: + QUmlProperty *_partWithPort; + QUmlConnectableElement *_role; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconnectorend_p.h b/src/uml/qumlconnectorend_p.h deleted file mode 100644 index deaed090..00000000 --- a/src/uml/qumlconnectorend_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONNECTOREND_P_H -#define QUMLCONNECTOREND_P_H - -#include "QtUml/QUmlConnectorEnd" - -#include "private/qumlmultiplicityelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConnectorEndPrivate : public QUmlMultiplicityElementPrivate -{ -public: - QUmlConnectorEndPrivate(); - - QUmlProperty *partWithPort; - QUmlConnectableElement *role; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONNECTOREND_P_H - diff --git a/src/uml/qumlconsiderignorefragment.cpp b/src/uml/qumlconsiderignorefragment.cpp index aeab198f..94ce5807 100644 --- a/src/uml/qumlconsiderignorefragment.cpp +++ b/src/uml/qumlconsiderignorefragment.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlconsiderignorefragment.h" -#include "qumlconsiderignorefragment_p.h" #include <QtUml/QUmlNamedElement> QT_BEGIN_NAMESPACE -QUmlConsiderIgnoreFragmentPrivate::QUmlConsiderIgnoreFragmentPrivate() -{ -} - /*! \class QUmlConsiderIgnoreFragment @@ -57,11 +52,8 @@ QUmlConsiderIgnoreFragmentPrivate::QUmlConsiderIgnoreFragmentPrivate() \brief A consider ignore fragment is a kind of combined fragment that is used for the consider and ignore cases, which require lists of pertinent messages to be specified. */ -QUmlConsiderIgnoreFragment::QUmlConsiderIgnoreFragment(bool create_d_ptr) : - QUmlCombinedFragment(false) +QUmlConsiderIgnoreFragment::QUmlConsiderIgnoreFragment() { - if (create_d_ptr) - set_d_ptr(new QUmlConsiderIgnoreFragmentPrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QSet<QUmlNamedElement *> QUmlConsiderIgnoreFragment::message() const { // This is a read-write association end - QM_D(const QUmlConsiderIgnoreFragment); - return d->message; + return _message; } void QUmlConsiderIgnoreFragment::addMessage(QUmlNamedElement *message) { // This is a read-write association end - QM_D(QUmlConsiderIgnoreFragment); - if (!d->message.contains(message)) { - d->message.insert(message); + if (!_message.contains(message)) { + _message.insert(message); } } @@ -91,9 +81,8 @@ void QUmlConsiderIgnoreFragment::removeMessage(QUmlNamedElement *message) { // This is a read-write association end - QM_D(QUmlConsiderIgnoreFragment); - if (d->message.contains(message)) { - d->message.remove(message); + if (_message.contains(message)) { + _message.remove(message); } } diff --git a/src/uml/qumlconsiderignorefragment.h b/src/uml/qumlconsiderignorefragment.h index 0a8aaaeb..63847e5b 100644 --- a/src/uml/qumlconsiderignorefragment.h +++ b/src/uml/qumlconsiderignorefragment.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlNamedElement; -class QUmlConsiderIgnoreFragmentPrivate; class Q_UML_EXPORT QUmlConsiderIgnoreFragment : public QUmlCombinedFragment { public: - QUmlConsiderIgnoreFragment(bool create_d_ptr = true); + QUmlConsiderIgnoreFragment(); // Owned attributes QSet<QUmlNamedElement *> message() const; void addMessage(QUmlNamedElement *message); void removeMessage(QUmlNamedElement *message); + +protected: + QSet<QUmlNamedElement *> _message; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconsiderignorefragment_p.h b/src/uml/qumlconsiderignorefragment_p.h deleted file mode 100644 index 6f00c6d1..00000000 --- a/src/uml/qumlconsiderignorefragment_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONSIDERIGNOREFRAGMENT_P_H -#define QUMLCONSIDERIGNOREFRAGMENT_P_H - -#include "QtUml/QUmlConsiderIgnoreFragment" - -#include "private/qumlcombinedfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConsiderIgnoreFragmentPrivate : public QUmlCombinedFragmentPrivate -{ -public: - QUmlConsiderIgnoreFragmentPrivate(); - - QSet<QUmlNamedElement *> message; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONSIDERIGNOREFRAGMENT_P_H - diff --git a/src/uml/qumlconstraint.cpp b/src/uml/qumlconstraint.cpp index fe157f25..6dd4a20b 100644 --- a/src/uml/qumlconstraint.cpp +++ b/src/uml/qumlconstraint.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlconstraint.h" -#include "qumlconstraint_p.h" #include <QtUml/QUmlElement> #include <QtUml/QUmlNamespace> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlConstraintPrivate::QUmlConstraintPrivate() : - context(0), - specification(0) -{ -} - /*! \class QUmlConstraint @@ -61,11 +54,10 @@ QUmlConstraintPrivate::QUmlConstraintPrivate() : \brief A constraint is a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of an element. */ -QUmlConstraint::QUmlConstraint(bool create_d_ptr) : - QUmlPackageableElement(false) +QUmlConstraint::QUmlConstraint() : + _context(0), + _specification(0) { - if (create_d_ptr) - set_d_ptr(new QUmlConstraintPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QList<QUmlElement *> QUmlConstraint::constrainedElement() const { // This is a read-write association end - QM_D(const QUmlConstraint); - return d->constrainedElement; + return _constrainedElement; } void QUmlConstraint::addConstrainedElement(QUmlElement *constrainedElement) { // This is a read-write association end - QM_D(QUmlConstraint); - if (!d->constrainedElement.contains(constrainedElement)) { - d->constrainedElement.append(constrainedElement); + if (!_constrainedElement.contains(constrainedElement)) { + _constrainedElement.append(constrainedElement); } } @@ -95,9 +85,8 @@ void QUmlConstraint::removeConstrainedElement(QUmlElement *constrainedElement) { // This is a read-write association end - QM_D(QUmlConstraint); - if (d->constrainedElement.contains(constrainedElement)) { - d->constrainedElement.removeAll(constrainedElement); + if (_constrainedElement.contains(constrainedElement)) { + _constrainedElement.removeAll(constrainedElement); } } @@ -108,17 +97,15 @@ QUmlNamespace *QUmlConstraint::context() const { // This is a read-write association end - QM_D(const QUmlConstraint); - return d->context; + return _context; } void QUmlConstraint::setContext(QUmlNamespace *context) { // This is a read-write association end - QM_D(QUmlConstraint); - if (d->context != context) { - d->context = context; + if (_context != context) { + _context = context; } } @@ -129,17 +116,15 @@ QUmlValueSpecification *QUmlConstraint::specification() const { // This is a read-write association end - QM_D(const QUmlConstraint); - return d->specification; + return _specification; } void QUmlConstraint::setSpecification(QUmlValueSpecification *specification) { // This is a read-write association end - QM_D(QUmlConstraint); - if (d->specification != specification) { - d->specification = specification; + if (_specification != specification) { + _specification = specification; } } diff --git a/src/uml/qumlconstraint.h b/src/uml/qumlconstraint.h index e2c12111..60a054a0 100644 --- a/src/uml/qumlconstraint.h +++ b/src/uml/qumlconstraint.h @@ -55,11 +55,10 @@ class QUmlElement; class QUmlNamespace; class QUmlValueSpecification; -class QUmlConstraintPrivate; class Q_UML_EXPORT QUmlConstraint : public QUmlPackageableElement { public: - QUmlConstraint(bool create_d_ptr = true); + QUmlConstraint(); // Owned attributes QList<QUmlElement *> constrainedElement() const; @@ -69,6 +68,11 @@ public: void setContext(QUmlNamespace *context); QUmlValueSpecification *specification() const; void setSpecification(QUmlValueSpecification *specification); + +protected: + QList<QUmlElement *> _constrainedElement; + QUmlNamespace *_context; + QUmlValueSpecification *_specification; }; QT_END_NAMESPACE diff --git a/src/uml/qumlconstraint_p.h b/src/uml/qumlconstraint_p.h deleted file mode 100644 index 10d8ad44..00000000 --- a/src/uml/qumlconstraint_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONSTRAINT_P_H -#define QUMLCONSTRAINT_P_H - -#include "QtUml/QUmlConstraint" - -#include "private/qumlpackageableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlConstraintPrivate : public QUmlPackageableElementPrivate -{ -public: - QUmlConstraintPrivate(); - - QList<QUmlElement *> constrainedElement; - QUmlNamespace *context; - QUmlValueSpecification *specification; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONSTRAINT_P_H - diff --git a/src/uml/qumlcontinuation.cpp b/src/uml/qumlcontinuation.cpp index 53d36d72..64a2788e 100644 --- a/src/uml/qumlcontinuation.cpp +++ b/src/uml/qumlcontinuation.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlcontinuation.h" -#include "qumlcontinuation_p.h" QT_BEGIN_NAMESPACE -QUmlContinuationPrivate::QUmlContinuationPrivate() : - setting(true) -{ -} - /*! \class QUmlContinuation @@ -56,11 +50,9 @@ QUmlContinuationPrivate::QUmlContinuationPrivate() : \brief A continuation is a syntactic way to define continuations of different branches of an alternative combined fragment. Continuations is intuitively similar to labels representing intermediate points in a flow of control. */ -QUmlContinuation::QUmlContinuation(bool create_d_ptr) : - QUmlInteractionFragment(false) +QUmlContinuation::QUmlContinuation() : + _setting(true) { - if (create_d_ptr) - set_d_ptr(new QUmlContinuationPrivate); } // OWNED ATTRIBUTES @@ -72,17 +64,15 @@ bool QUmlContinuation::setting() const { // This is a read-write property - QM_D(const QUmlContinuation); - return d->setting; + return _setting; } void QUmlContinuation::setSetting(bool setting) { // This is a read-write property - QM_D(QUmlContinuation); - if (d->setting != setting) { - d->setting = setting; + if (_setting != setting) { + _setting = setting; } } diff --git a/src/uml/qumlcontinuation.h b/src/uml/qumlcontinuation.h index d4fda22a..88d009bc 100644 --- a/src/uml/qumlcontinuation.h +++ b/src/uml/qumlcontinuation.h @@ -51,15 +51,17 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlContinuationPrivate; class Q_UML_EXPORT QUmlContinuation : public QUmlInteractionFragment { public: - QUmlContinuation(bool create_d_ptr = true); + QUmlContinuation(); // Owned attributes bool setting() const; void setSetting(bool setting); + +protected: + bool _setting; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcontinuation_p.h b/src/uml/qumlcontinuation_p.h deleted file mode 100644 index 97b21d65..00000000 --- a/src/uml/qumlcontinuation_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONTINUATION_P_H -#define QUMLCONTINUATION_P_H - -#include "QtUml/QUmlContinuation" - -#include "private/qumlinteractionfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlContinuationPrivate : public QUmlInteractionFragmentPrivate -{ -public: - QUmlContinuationPrivate(); - - bool setting; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONTINUATION_P_H - diff --git a/src/uml/qumlcontrolflow.cpp b/src/uml/qumlcontrolflow.cpp index 44490f2d..ab815574 100644 --- a/src/uml/qumlcontrolflow.cpp +++ b/src/uml/qumlcontrolflow.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlcontrolflow.h" -#include "qumlcontrolflow_p.h" QT_BEGIN_NAMESPACE -QUmlControlFlowPrivate::QUmlControlFlowPrivate() -{ -} - /*! \class QUmlControlFlow @@ -55,11 +50,8 @@ QUmlControlFlowPrivate::QUmlControlFlowPrivate() \brief A control flow is an edge that starts an activity node after the previous one is finished. */ -QUmlControlFlow::QUmlControlFlow(bool create_d_ptr) : - QUmlActivityEdge(false) +QUmlControlFlow::QUmlControlFlow() { - if (create_d_ptr) - set_d_ptr(new QUmlControlFlowPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlcontrolflow.h b/src/uml/qumlcontrolflow.h index c027d6c0..4949ca8d 100644 --- a/src/uml/qumlcontrolflow.h +++ b/src/uml/qumlcontrolflow.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlControlFlowPrivate; class Q_UML_EXPORT QUmlControlFlow : public QUmlActivityEdge { public: - QUmlControlFlow(bool create_d_ptr = true); + QUmlControlFlow(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlcontrolflow_p.h b/src/uml/qumlcontrolflow_p.h deleted file mode 100644 index e972b8bf..00000000 --- a/src/uml/qumlcontrolflow_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONTROLFLOW_P_H -#define QUMLCONTROLFLOW_P_H - -#include "QtUml/QUmlControlFlow" - -#include "private/qumlactivityedge_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlControlFlowPrivate : public QUmlActivityEdgePrivate -{ -public: - QUmlControlFlowPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONTROLFLOW_P_H - diff --git a/src/uml/qumlcontrolnode.cpp b/src/uml/qumlcontrolnode.cpp index 83eaa654..bde61bae 100644 --- a/src/uml/qumlcontrolnode.cpp +++ b/src/uml/qumlcontrolnode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlcontrolnode.h" -#include "qumlcontrolnode_p.h" QT_BEGIN_NAMESPACE -QUmlControlNodePrivate::QUmlControlNodePrivate() -{ -} - /*! \class QUmlControlNode @@ -55,11 +50,8 @@ QUmlControlNodePrivate::QUmlControlNodePrivate() \brief A control node is an abstract activity node that coordinates flows in an activity. */ -QUmlControlNode::QUmlControlNode(bool create_d_ptr) : - QUmlActivityNode(false) +QUmlControlNode::QUmlControlNode() { - if (create_d_ptr) - set_d_ptr(new QUmlControlNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlcontrolnode.h b/src/uml/qumlcontrolnode.h index 516ebe2e..287fc332 100644 --- a/src/uml/qumlcontrolnode.h +++ b/src/uml/qumlcontrolnode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlControlNodePrivate; class Q_UML_EXPORT QUmlControlNode : public QUmlActivityNode { public: - Q_DECL_HIDDEN QUmlControlNode(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlControlNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlcontrolnode_p.h b/src/uml/qumlcontrolnode_p.h deleted file mode 100644 index 2959eb42..00000000 --- a/src/uml/qumlcontrolnode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCONTROLNODE_P_H -#define QUMLCONTROLNODE_P_H - -#include "QtUml/QUmlControlNode" - -#include "private/qumlactivitynode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlControlNodePrivate : public QUmlActivityNodePrivate -{ -public: - QUmlControlNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCONTROLNODE_P_H - diff --git a/src/uml/qumlcreatelinkaction.cpp b/src/uml/qumlcreatelinkaction.cpp index da33d10a..35d063dd 100644 --- a/src/uml/qumlcreatelinkaction.cpp +++ b/src/uml/qumlcreatelinkaction.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlcreatelinkaction.h" -#include "qumlcreatelinkaction_p.h" #include <QtUml/QUmlLinkEndCreationData> QT_BEGIN_NAMESPACE -QUmlCreateLinkActionPrivate::QUmlCreateLinkActionPrivate() -{ -} - /*! \class QUmlCreateLinkAction @@ -57,11 +52,8 @@ QUmlCreateLinkActionPrivate::QUmlCreateLinkActionPrivate() \brief A create link action is a write link action for creating links. */ -QUmlCreateLinkAction::QUmlCreateLinkAction(bool create_d_ptr) : - QUmlWriteLinkAction(false) +QUmlCreateLinkAction::QUmlCreateLinkAction() { - if (create_d_ptr) - set_d_ptr(new QUmlCreateLinkActionPrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QSet<QUmlLinkEndCreationData *> QUmlCreateLinkAction::endData() const { // This is a read-write association end - QM_D(const QUmlCreateLinkAction); - return d->endData; + return _endData; } void QUmlCreateLinkAction::addEndData(QUmlLinkEndCreationData *endData) { // This is a read-write association end - QM_D(QUmlCreateLinkAction); - if (!d->endData.contains(endData)) { - d->endData.insert(endData); + if (!_endData.contains(endData)) { + _endData.insert(endData); } } @@ -91,9 +81,8 @@ void QUmlCreateLinkAction::removeEndData(QUmlLinkEndCreationData *endData) { // This is a read-write association end - QM_D(QUmlCreateLinkAction); - if (d->endData.contains(endData)) { - d->endData.remove(endData); + if (_endData.contains(endData)) { + _endData.remove(endData); } } diff --git a/src/uml/qumlcreatelinkaction.h b/src/uml/qumlcreatelinkaction.h index 9daa5587..5c89125d 100644 --- a/src/uml/qumlcreatelinkaction.h +++ b/src/uml/qumlcreatelinkaction.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlLinkEndCreationData; -class QUmlCreateLinkActionPrivate; class Q_UML_EXPORT QUmlCreateLinkAction : public QUmlWriteLinkAction { public: - QUmlCreateLinkAction(bool create_d_ptr = true); + QUmlCreateLinkAction(); // Owned attributes QSet<QUmlLinkEndCreationData *> endData() const; void addEndData(QUmlLinkEndCreationData *endData); void removeEndData(QUmlLinkEndCreationData *endData); + +protected: + QSet<QUmlLinkEndCreationData *> _endData; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcreatelinkaction_p.h b/src/uml/qumlcreatelinkaction_p.h deleted file mode 100644 index 01dcaddb..00000000 --- a/src/uml/qumlcreatelinkaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCREATELINKACTION_P_H -#define QUMLCREATELINKACTION_P_H - -#include "QtUml/QUmlCreateLinkAction" - -#include "private/qumlwritelinkaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCreateLinkActionPrivate : public QUmlWriteLinkActionPrivate -{ -public: - QUmlCreateLinkActionPrivate(); - - QSet<QUmlLinkEndCreationData *> endData; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCREATELINKACTION_P_H - diff --git a/src/uml/qumlcreatelinkobjectaction.cpp b/src/uml/qumlcreatelinkobjectaction.cpp index e23689ba..910bb400 100644 --- a/src/uml/qumlcreatelinkobjectaction.cpp +++ b/src/uml/qumlcreatelinkobjectaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlcreatelinkobjectaction.h" -#include "qumlcreatelinkobjectaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlCreateLinkObjectActionPrivate::QUmlCreateLinkObjectActionPrivate() : - result(0) -{ -} - /*! \class QUmlCreateLinkObjectAction @@ -58,11 +52,9 @@ QUmlCreateLinkObjectActionPrivate::QUmlCreateLinkObjectActionPrivate() : \brief A create link object action creates a link object. */ -QUmlCreateLinkObjectAction::QUmlCreateLinkObjectAction(bool create_d_ptr) : - QUmlCreateLinkAction(false) +QUmlCreateLinkObjectAction::QUmlCreateLinkObjectAction() : + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlCreateLinkObjectActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOutputPin *QUmlCreateLinkObjectAction::result() const { // This is a read-write association end - QM_D(const QUmlCreateLinkObjectAction); - return d->result; + return _result; } void QUmlCreateLinkObjectAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlCreateLinkObjectAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlcreatelinkobjectaction.h b/src/uml/qumlcreatelinkobjectaction.h index 287973e0..0c28d621 100644 --- a/src/uml/qumlcreatelinkobjectaction.h +++ b/src/uml/qumlcreatelinkobjectaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlCreateLinkObjectActionPrivate; class Q_UML_EXPORT QUmlCreateLinkObjectAction : public QUmlCreateLinkAction { public: - QUmlCreateLinkObjectAction(bool create_d_ptr = true); + QUmlCreateLinkObjectAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcreatelinkobjectaction_p.h b/src/uml/qumlcreatelinkobjectaction_p.h deleted file mode 100644 index 1ad44bbe..00000000 --- a/src/uml/qumlcreatelinkobjectaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCREATELINKOBJECTACTION_P_H -#define QUMLCREATELINKOBJECTACTION_P_H - -#include "QtUml/QUmlCreateLinkObjectAction" - -#include "private/qumlcreatelinkaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCreateLinkObjectActionPrivate : public QUmlCreateLinkActionPrivate -{ -public: - QUmlCreateLinkObjectActionPrivate(); - - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCREATELINKOBJECTACTION_P_H - diff --git a/src/uml/qumlcreateobjectaction.cpp b/src/uml/qumlcreateobjectaction.cpp index 46b6dda3..dc6690c9 100644 --- a/src/uml/qumlcreateobjectaction.cpp +++ b/src/uml/qumlcreateobjectaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlcreateobjectaction.h" -#include "qumlcreateobjectaction_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlCreateObjectActionPrivate::QUmlCreateObjectActionPrivate() : - classifier(0), - result(0) -{ -} - /*! \class QUmlCreateObjectAction @@ -60,11 +53,10 @@ QUmlCreateObjectActionPrivate::QUmlCreateObjectActionPrivate() : \brief A create object action is an action that creates an object that conforms to a statically specified classifier and puts it on an output pin at runtime. */ -QUmlCreateObjectAction::QUmlCreateObjectAction(bool create_d_ptr) : - QUmlAction(false) +QUmlCreateObjectAction::QUmlCreateObjectAction() : + _classifier(0), + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlCreateObjectActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlClassifier *QUmlCreateObjectAction::classifier() const { // This is a read-write association end - QM_D(const QUmlCreateObjectAction); - return d->classifier; + return _classifier; } void QUmlCreateObjectAction::setClassifier(QUmlClassifier *classifier) { // This is a read-write association end - QM_D(QUmlCreateObjectAction); - if (d->classifier != classifier) { - d->classifier = classifier; + if (_classifier != classifier) { + _classifier = classifier; } } @@ -97,17 +87,15 @@ QUmlOutputPin *QUmlCreateObjectAction::result() const { // This is a read-write association end - QM_D(const QUmlCreateObjectAction); - return d->result; + return _result; } void QUmlCreateObjectAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlCreateObjectAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlcreateobjectaction.h b/src/uml/qumlcreateobjectaction.h index 18f83999..7ef1fd4d 100644 --- a/src/uml/qumlcreateobjectaction.h +++ b/src/uml/qumlcreateobjectaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlClassifier; class QUmlOutputPin; -class QUmlCreateObjectActionPrivate; class Q_UML_EXPORT QUmlCreateObjectAction : public QUmlAction { public: - QUmlCreateObjectAction(bool create_d_ptr = true); + QUmlCreateObjectAction(); // Owned attributes QUmlClassifier *classifier() const; void setClassifier(QUmlClassifier *classifier); QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlClassifier *_classifier; + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlcreateobjectaction_p.h b/src/uml/qumlcreateobjectaction_p.h deleted file mode 100644 index 6aeece35..00000000 --- a/src/uml/qumlcreateobjectaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLCREATEOBJECTACTION_P_H -#define QUMLCREATEOBJECTACTION_P_H - -#include "QtUml/QUmlCreateObjectAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlCreateObjectActionPrivate : public QUmlActionPrivate -{ -public: - QUmlCreateObjectActionPrivate(); - - QUmlClassifier *classifier; - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLCREATEOBJECTACTION_P_H - diff --git a/src/uml/qumldatastorenode.cpp b/src/uml/qumldatastorenode.cpp index 29255b3b..7ac9c023 100644 --- a/src/uml/qumldatastorenode.cpp +++ b/src/uml/qumldatastorenode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumldatastorenode.h" -#include "qumldatastorenode_p.h" QT_BEGIN_NAMESPACE -QUmlDataStoreNodePrivate::QUmlDataStoreNodePrivate() -{ -} - /*! \class QUmlDataStoreNode @@ -55,11 +50,8 @@ QUmlDataStoreNodePrivate::QUmlDataStoreNodePrivate() \brief A data store node is a central buffer node for non-transient information. */ -QUmlDataStoreNode::QUmlDataStoreNode(bool create_d_ptr) : - QUmlCentralBufferNode(false) +QUmlDataStoreNode::QUmlDataStoreNode() { - if (create_d_ptr) - set_d_ptr(new QUmlDataStoreNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumldatastorenode.h b/src/uml/qumldatastorenode.h index 0e62fc77..7fab854d 100644 --- a/src/uml/qumldatastorenode.h +++ b/src/uml/qumldatastorenode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlDataStoreNodePrivate; class Q_UML_EXPORT QUmlDataStoreNode : public QUmlCentralBufferNode { public: - QUmlDataStoreNode(bool create_d_ptr = true); + QUmlDataStoreNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumldatastorenode_p.h b/src/uml/qumldatastorenode_p.h deleted file mode 100644 index e95adf09..00000000 --- a/src/uml/qumldatastorenode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDATASTORENODE_P_H -#define QUMLDATASTORENODE_P_H - -#include "QtUml/QUmlDataStoreNode" - -#include "private/qumlcentralbuffernode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDataStoreNodePrivate : public QUmlCentralBufferNodePrivate -{ -public: - QUmlDataStoreNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDATASTORENODE_P_H - diff --git a/src/uml/qumldatatype.cpp b/src/uml/qumldatatype.cpp index 88c5d5c0..d2ba072e 100644 --- a/src/uml/qumldatatype.cpp +++ b/src/uml/qumldatatype.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumldatatype.h" -#include "qumldatatype_p.h" #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlOperation> @@ -47,10 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlDataTypePrivate::QUmlDataTypePrivate() -{ -} - /*! \class QUmlDataType @@ -59,11 +54,8 @@ QUmlDataTypePrivate::QUmlDataTypePrivate() \brief A data type is a type whose instances are identified only by their value. A data type may contain attributes to support the modeling of structured data types. */ -QUmlDataType::QUmlDataType(bool create_d_ptr) : - QUmlClassifier(false) +QUmlDataType::QUmlDataType() { - if (create_d_ptr) - set_d_ptr(new QUmlDataTypePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QList<QUmlProperty *> QUmlDataType::ownedAttribute() const { // This is a read-write association end - QM_D(const QUmlDataType); - return d->ownedAttribute; + return _ownedAttribute; } void QUmlDataType::addOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlDataType); - if (!d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.append(ownedAttribute); + if (!_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.append(ownedAttribute); } } @@ -93,9 +83,8 @@ void QUmlDataType::removeOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlDataType); - if (d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.removeAll(ownedAttribute); + if (_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.removeAll(ownedAttribute); } } @@ -106,17 +95,15 @@ QList<QUmlOperation *> QUmlDataType::ownedOperation() const { // This is a read-write association end - QM_D(const QUmlDataType); - return d->ownedOperation; + return _ownedOperation; } void QUmlDataType::addOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlDataType); - if (!d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.append(ownedOperation); + if (!_ownedOperation.contains(ownedOperation)) { + _ownedOperation.append(ownedOperation); } } @@ -124,9 +111,8 @@ void QUmlDataType::removeOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlDataType); - if (d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.removeAll(ownedOperation); + if (_ownedOperation.contains(ownedOperation)) { + _ownedOperation.removeAll(ownedOperation); } } diff --git a/src/uml/qumldatatype.h b/src/uml/qumldatatype.h index 39c15dc8..153a0d52 100644 --- a/src/uml/qumldatatype.h +++ b/src/uml/qumldatatype.h @@ -55,11 +55,10 @@ class QUmlNamedElement; class QUmlOperation; class QUmlProperty; -class QUmlDataTypePrivate; class Q_UML_EXPORT QUmlDataType : public QUmlClassifier { public: - QUmlDataType(bool create_d_ptr = true); + QUmlDataType(); // Owned attributes QList<QUmlProperty *> ownedAttribute() const; @@ -71,6 +70,10 @@ public: // Operations QSet<QUmlNamedElement *> inherit(QSet<QUmlNamedElement *> inhs) const; + +protected: + QList<QUmlProperty *> _ownedAttribute; + QList<QUmlOperation *> _ownedOperation; }; QT_END_NAMESPACE diff --git a/src/uml/qumldatatype_p.h b/src/uml/qumldatatype_p.h deleted file mode 100644 index d653a2d0..00000000 --- a/src/uml/qumldatatype_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDATATYPE_P_H -#define QUMLDATATYPE_P_H - -#include "QtUml/QUmlDataType" - -#include "private/qumlclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDataTypePrivate : public QUmlClassifierPrivate -{ -public: - QUmlDataTypePrivate(); - - QList<QUmlProperty *> ownedAttribute; - QList<QUmlOperation *> ownedOperation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDATATYPE_P_H - diff --git a/src/uml/qumldecisionnode.cpp b/src/uml/qumldecisionnode.cpp index 9b988f4c..767f1372 100644 --- a/src/uml/qumldecisionnode.cpp +++ b/src/uml/qumldecisionnode.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumldecisionnode.h" -#include "qumldecisionnode_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlObjectFlow> QT_BEGIN_NAMESPACE -QUmlDecisionNodePrivate::QUmlDecisionNodePrivate() : - decisionInput(0), - decisionInputFlow(0) -{ -} - /*! \class QUmlDecisionNode @@ -60,11 +53,10 @@ QUmlDecisionNodePrivate::QUmlDecisionNodePrivate() : \brief A decision node is a control node that chooses between outgoing flows. */ -QUmlDecisionNode::QUmlDecisionNode(bool create_d_ptr) : - QUmlControlNode(false) +QUmlDecisionNode::QUmlDecisionNode() : + _decisionInput(0), + _decisionInputFlow(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDecisionNodePrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlBehavior *QUmlDecisionNode::decisionInput() const { // This is a read-write association end - QM_D(const QUmlDecisionNode); - return d->decisionInput; + return _decisionInput; } void QUmlDecisionNode::setDecisionInput(QUmlBehavior *decisionInput) { // This is a read-write association end - QM_D(QUmlDecisionNode); - if (d->decisionInput != decisionInput) { - d->decisionInput = decisionInput; + if (_decisionInput != decisionInput) { + _decisionInput = decisionInput; } } @@ -97,17 +87,15 @@ QUmlObjectFlow *QUmlDecisionNode::decisionInputFlow() const { // This is a read-write association end - QM_D(const QUmlDecisionNode); - return d->decisionInputFlow; + return _decisionInputFlow; } void QUmlDecisionNode::setDecisionInputFlow(QUmlObjectFlow *decisionInputFlow) { // This is a read-write association end - QM_D(QUmlDecisionNode); - if (d->decisionInputFlow != decisionInputFlow) { - d->decisionInputFlow = decisionInputFlow; + if (_decisionInputFlow != decisionInputFlow) { + _decisionInputFlow = decisionInputFlow; } } diff --git a/src/uml/qumldecisionnode.h b/src/uml/qumldecisionnode.h index de27ae66..48150648 100644 --- a/src/uml/qumldecisionnode.h +++ b/src/uml/qumldecisionnode.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlBehavior; class QUmlObjectFlow; -class QUmlDecisionNodePrivate; class Q_UML_EXPORT QUmlDecisionNode : public QUmlControlNode { public: - QUmlDecisionNode(bool create_d_ptr = true); + QUmlDecisionNode(); // Owned attributes QUmlBehavior *decisionInput() const; void setDecisionInput(QUmlBehavior *decisionInput); QUmlObjectFlow *decisionInputFlow() const; void setDecisionInputFlow(QUmlObjectFlow *decisionInputFlow); + +protected: + QUmlBehavior *_decisionInput; + QUmlObjectFlow *_decisionInputFlow; }; QT_END_NAMESPACE diff --git a/src/uml/qumldecisionnode_p.h b/src/uml/qumldecisionnode_p.h deleted file mode 100644 index f84545ee..00000000 --- a/src/uml/qumldecisionnode_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDECISIONNODE_P_H -#define QUMLDECISIONNODE_P_H - -#include "QtUml/QUmlDecisionNode" - -#include "private/qumlcontrolnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDecisionNodePrivate : public QUmlControlNodePrivate -{ -public: - QUmlDecisionNodePrivate(); - - QUmlBehavior *decisionInput; - QUmlObjectFlow *decisionInputFlow; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDECISIONNODE_P_H - diff --git a/src/uml/qumldependency.cpp b/src/uml/qumldependency.cpp index 48daa1e0..2035b790 100644 --- a/src/uml/qumldependency.cpp +++ b/src/uml/qumldependency.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumldependency.h" -#include "qumldependency_p.h" #include <QtUml/QUmlNamedElement> QT_BEGIN_NAMESPACE -QUmlDependencyPrivate::QUmlDependencyPrivate() -{ -} - /*! \class QUmlDependency @@ -57,12 +52,8 @@ QUmlDependencyPrivate::QUmlDependencyPrivate() \brief A dependency is a relationship that signifies that a single or a set of model elements requires other model elements for their specification or implementation. This means that the complete semantics of the depending elements is either semantically or structurally dependent on the definition of the supplier element(s). */ -QUmlDependency::QUmlDependency(bool create_d_ptr) : - QUmlPackageableElement(false), - QUmlDirectedRelationship(false) +QUmlDependency::QUmlDependency() { - if (create_d_ptr) - set_d_ptr(new QUmlDependencyPrivate); } // OWNED ATTRIBUTES @@ -74,17 +65,15 @@ QSet<QUmlNamedElement *> QUmlDependency::client() const { // This is a read-write association end - QM_D(const QUmlDependency); - return d->client; + return _client; } void QUmlDependency::addClient(QUmlNamedElement *client) { // This is a read-write association end - QM_D(QUmlDependency); - if (!d->client.contains(client)) { - d->client.insert(client); + if (!_client.contains(client)) { + _client.insert(client); } } @@ -92,9 +81,8 @@ void QUmlDependency::removeClient(QUmlNamedElement *client) { // This is a read-write association end - QM_D(QUmlDependency); - if (d->client.contains(client)) { - d->client.remove(client); + if (_client.contains(client)) { + _client.remove(client); } } @@ -105,17 +93,15 @@ QSet<QUmlNamedElement *> QUmlDependency::supplier() const { // This is a read-write association end - QM_D(const QUmlDependency); - return d->supplier; + return _supplier; } void QUmlDependency::addSupplier(QUmlNamedElement *supplier) { // This is a read-write association end - QM_D(QUmlDependency); - if (!d->supplier.contains(supplier)) { - d->supplier.insert(supplier); + if (!_supplier.contains(supplier)) { + _supplier.insert(supplier); } } @@ -123,9 +109,8 @@ void QUmlDependency::removeSupplier(QUmlNamedElement *supplier) { // This is a read-write association end - QM_D(QUmlDependency); - if (d->supplier.contains(supplier)) { - d->supplier.remove(supplier); + if (_supplier.contains(supplier)) { + _supplier.remove(supplier); } } diff --git a/src/uml/qumldependency.h b/src/uml/qumldependency.h index 22a92285..21cca26f 100644 --- a/src/uml/qumldependency.h +++ b/src/uml/qumldependency.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlNamedElement; -class QUmlDependencyPrivate; class Q_UML_EXPORT QUmlDependency : public QUmlPackageableElement, public QUmlDirectedRelationship { public: - QUmlDependency(bool create_d_ptr = true); + QUmlDependency(); // Owned attributes QSet<QUmlNamedElement *> client() const; @@ -67,6 +66,10 @@ public: QSet<QUmlNamedElement *> supplier() const; void addSupplier(QUmlNamedElement *supplier); void removeSupplier(QUmlNamedElement *supplier); + +protected: + QSet<QUmlNamedElement *> _client; + QSet<QUmlNamedElement *> _supplier; }; QT_END_NAMESPACE diff --git a/src/uml/qumldependency_p.h b/src/uml/qumldependency_p.h deleted file mode 100644 index fd66c6bb..00000000 --- a/src/uml/qumldependency_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDEPENDENCY_P_H -#define QUMLDEPENDENCY_P_H - -#include "QtUml/QUmlDependency" - -#include "private/qumlpackageableelement_p.h" -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDependencyPrivate : public QUmlPackageableElementPrivate, public QUmlDirectedRelationshipPrivate -{ -public: - QUmlDependencyPrivate(); - - QSet<QUmlNamedElement *> client; - QSet<QUmlNamedElement *> supplier; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDEPENDENCY_P_H - diff --git a/src/uml/qumldeployedartifact.cpp b/src/uml/qumldeployedartifact.cpp index efdfe9b2..38088f94 100644 --- a/src/uml/qumldeployedartifact.cpp +++ b/src/uml/qumldeployedartifact.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumldeployedartifact.h" -#include "qumldeployedartifact_p.h" QT_BEGIN_NAMESPACE -QUmlDeployedArtifactPrivate::QUmlDeployedArtifactPrivate() -{ -} - /*! \class QUmlDeployedArtifact @@ -55,11 +50,8 @@ QUmlDeployedArtifactPrivate::QUmlDeployedArtifactPrivate() \brief A deployed artifact is an artifact or artifact instance that has been deployed to a deployment target. */ -QUmlDeployedArtifact::QUmlDeployedArtifact(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlDeployedArtifact::QUmlDeployedArtifact() { - if (create_d_ptr) - set_d_ptr(new QUmlDeployedArtifactPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumldeployedartifact.h b/src/uml/qumldeployedartifact.h index b1dd3eeb..58a2f52d 100644 --- a/src/uml/qumldeployedartifact.h +++ b/src/uml/qumldeployedartifact.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlDeployedArtifactPrivate; class Q_UML_EXPORT QUmlDeployedArtifact : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlDeployedArtifact(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlDeployedArtifact(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumldeployedartifact_p.h b/src/uml/qumldeployedartifact_p.h deleted file mode 100644 index 2c663a9d..00000000 --- a/src/uml/qumldeployedartifact_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDEPLOYEDARTIFACT_P_H -#define QUMLDEPLOYEDARTIFACT_P_H - -#include "QtUml/QUmlDeployedArtifact" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDeployedArtifactPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlDeployedArtifactPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDEPLOYEDARTIFACT_P_H - diff --git a/src/uml/qumldeployment.cpp b/src/uml/qumldeployment.cpp index a68ddb20..32525a71 100644 --- a/src/uml/qumldeployment.cpp +++ b/src/uml/qumldeployment.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumldeployment.h" -#include "qumldeployment_p.h" #include <QtUml/QUmlDeployedArtifact> #include <QtUml/QUmlDeploymentSpecification> @@ -47,11 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlDeploymentPrivate::QUmlDeploymentPrivate() : - location(0) -{ -} - /*! \class QUmlDeployment @@ -60,11 +54,9 @@ QUmlDeploymentPrivate::QUmlDeploymentPrivate() : \brief A deployment is the allocation of an artifact or artifact instance to a deployment target.A component deployment is the deployment of one or more artifacts or artifact instances to a deployment target, optionally parameterized by a deployment specification. Examples are executables and configuration files. */ -QUmlDeployment::QUmlDeployment(bool create_d_ptr) : - QUmlDependency(false) +QUmlDeployment::QUmlDeployment() : + _location(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDeploymentPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QSet<QUmlDeploymentSpecification *> QUmlDeployment::configuration() const { // This is a read-write association end - QM_D(const QUmlDeployment); - return d->configuration; + return _configuration; } void QUmlDeployment::addConfiguration(QUmlDeploymentSpecification *configuration) { // This is a read-write association end - QM_D(QUmlDeployment); - if (!d->configuration.contains(configuration)) { - d->configuration.insert(configuration); + if (!_configuration.contains(configuration)) { + _configuration.insert(configuration); } } @@ -94,9 +84,8 @@ void QUmlDeployment::removeConfiguration(QUmlDeploymentSpecification *configurat { // This is a read-write association end - QM_D(QUmlDeployment); - if (d->configuration.contains(configuration)) { - d->configuration.remove(configuration); + if (_configuration.contains(configuration)) { + _configuration.remove(configuration); } } @@ -107,17 +96,15 @@ QSet<QUmlDeployedArtifact *> QUmlDeployment::deployedArtifact() const { // This is a read-write association end - QM_D(const QUmlDeployment); - return d->deployedArtifact; + return _deployedArtifact; } void QUmlDeployment::addDeployedArtifact(QUmlDeployedArtifact *deployedArtifact) { // This is a read-write association end - QM_D(QUmlDeployment); - if (!d->deployedArtifact.contains(deployedArtifact)) { - d->deployedArtifact.insert(deployedArtifact); + if (!_deployedArtifact.contains(deployedArtifact)) { + _deployedArtifact.insert(deployedArtifact); } } @@ -125,9 +112,8 @@ void QUmlDeployment::removeDeployedArtifact(QUmlDeployedArtifact *deployedArtifa { // This is a read-write association end - QM_D(QUmlDeployment); - if (d->deployedArtifact.contains(deployedArtifact)) { - d->deployedArtifact.remove(deployedArtifact); + if (_deployedArtifact.contains(deployedArtifact)) { + _deployedArtifact.remove(deployedArtifact); } } @@ -138,17 +124,15 @@ QUmlDeploymentTarget *QUmlDeployment::location() const { // This is a read-write association end - QM_D(const QUmlDeployment); - return d->location; + return _location; } void QUmlDeployment::setLocation(QUmlDeploymentTarget *location) { // This is a read-write association end - QM_D(QUmlDeployment); - if (d->location != location) { - d->location = location; + if (_location != location) { + _location = location; } } diff --git a/src/uml/qumldeployment.h b/src/uml/qumldeployment.h index 78a523ec..659b793c 100644 --- a/src/uml/qumldeployment.h +++ b/src/uml/qumldeployment.h @@ -55,11 +55,10 @@ class QUmlDeployedArtifact; class QUmlDeploymentSpecification; class QUmlDeploymentTarget; -class QUmlDeploymentPrivate; class Q_UML_EXPORT QUmlDeployment : public QUmlDependency { public: - QUmlDeployment(bool create_d_ptr = true); + QUmlDeployment(); // Owned attributes QSet<QUmlDeploymentSpecification *> configuration() const; @@ -70,6 +69,11 @@ public: void removeDeployedArtifact(QUmlDeployedArtifact *deployedArtifact); QUmlDeploymentTarget *location() const; void setLocation(QUmlDeploymentTarget *location); + +protected: + QSet<QUmlDeploymentSpecification *> _configuration; + QSet<QUmlDeployedArtifact *> _deployedArtifact; + QUmlDeploymentTarget *_location; }; QT_END_NAMESPACE diff --git a/src/uml/qumldeployment_p.h b/src/uml/qumldeployment_p.h deleted file mode 100644 index 81e0ccb9..00000000 --- a/src/uml/qumldeployment_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDEPLOYMENT_P_H -#define QUMLDEPLOYMENT_P_H - -#include "QtUml/QUmlDeployment" - -#include "private/qumldependency_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDeploymentPrivate : public QUmlDependencyPrivate -{ -public: - QUmlDeploymentPrivate(); - - QSet<QUmlDeploymentSpecification *> configuration; - QSet<QUmlDeployedArtifact *> deployedArtifact; - QUmlDeploymentTarget *location; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDEPLOYMENT_P_H - diff --git a/src/uml/qumldeploymentspecification.cpp b/src/uml/qumldeploymentspecification.cpp index b28c45e0..8bab68ef 100644 --- a/src/uml/qumldeploymentspecification.cpp +++ b/src/uml/qumldeploymentspecification.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumldeploymentspecification.h" -#include "qumldeploymentspecification_p.h" #include <QtUml/QUmlDeployment> QT_BEGIN_NAMESPACE -QUmlDeploymentSpecificationPrivate::QUmlDeploymentSpecificationPrivate() : - deployment(0) -{ -} - /*! \class QUmlDeploymentSpecification @@ -58,11 +52,9 @@ QUmlDeploymentSpecificationPrivate::QUmlDeploymentSpecificationPrivate() : \brief A deployment specification specifies a set of properties that determine execution parameters of a component artifact that is deployed on a node. A deployment specification can be aimed at a specific type of container. An artifact that reifies or implements deployment specification properties is a deployment descriptor. */ -QUmlDeploymentSpecification::QUmlDeploymentSpecification(bool create_d_ptr) : - QUmlArtifact(false) +QUmlDeploymentSpecification::QUmlDeploymentSpecification() : + _deployment(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDeploymentSpecificationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlDeployment *QUmlDeploymentSpecification::deployment() const { // This is a read-write association end - QM_D(const QUmlDeploymentSpecification); - return d->deployment; + return _deployment; } void QUmlDeploymentSpecification::setDeployment(QUmlDeployment *deployment) { // This is a read-write association end - QM_D(QUmlDeploymentSpecification); - if (d->deployment != deployment) { - d->deployment = deployment; + if (_deployment != deployment) { + _deployment = deployment; } } @@ -95,17 +85,15 @@ QString QUmlDeploymentSpecification::deploymentLocation() const { // This is a read-write property - QM_D(const QUmlDeploymentSpecification); - return d->deploymentLocation; + return _deploymentLocation; } void QUmlDeploymentSpecification::setDeploymentLocation(QString deploymentLocation) { // This is a read-write property - QM_D(QUmlDeploymentSpecification); - if (d->deploymentLocation != deploymentLocation) { - d->deploymentLocation = deploymentLocation; + if (_deploymentLocation != deploymentLocation) { + _deploymentLocation = deploymentLocation; } } @@ -116,17 +104,15 @@ QString QUmlDeploymentSpecification::executionLocation() const { // This is a read-write property - QM_D(const QUmlDeploymentSpecification); - return d->executionLocation; + return _executionLocation; } void QUmlDeploymentSpecification::setExecutionLocation(QString executionLocation) { // This is a read-write property - QM_D(QUmlDeploymentSpecification); - if (d->executionLocation != executionLocation) { - d->executionLocation = executionLocation; + if (_executionLocation != executionLocation) { + _executionLocation = executionLocation; } } diff --git a/src/uml/qumldeploymentspecification.h b/src/uml/qumldeploymentspecification.h index 372b6926..22f98800 100644 --- a/src/uml/qumldeploymentspecification.h +++ b/src/uml/qumldeploymentspecification.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlDeployment; -class QUmlDeploymentSpecificationPrivate; class Q_UML_EXPORT QUmlDeploymentSpecification : public QUmlArtifact { public: - QUmlDeploymentSpecification(bool create_d_ptr = true); + QUmlDeploymentSpecification(); // Owned attributes QUmlDeployment *deployment() const; @@ -66,6 +65,11 @@ public: void setDeploymentLocation(QString deploymentLocation); QString executionLocation() const; void setExecutionLocation(QString executionLocation); + +protected: + QUmlDeployment *_deployment; + QString _deploymentLocation; + QString _executionLocation; }; QT_END_NAMESPACE diff --git a/src/uml/qumldeploymentspecification_p.h b/src/uml/qumldeploymentspecification_p.h deleted file mode 100644 index facd72f5..00000000 --- a/src/uml/qumldeploymentspecification_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDEPLOYMENTSPECIFICATION_P_H -#define QUMLDEPLOYMENTSPECIFICATION_P_H - -#include "QtUml/QUmlDeploymentSpecification" - -#include "private/qumlartifact_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDeploymentSpecificationPrivate : public QUmlArtifactPrivate -{ -public: - QUmlDeploymentSpecificationPrivate(); - - QUmlDeployment *deployment; - QString deploymentLocation; - QString executionLocation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDEPLOYMENTSPECIFICATION_P_H - diff --git a/src/uml/qumldeploymenttarget.cpp b/src/uml/qumldeploymenttarget.cpp index 0bd7c57b..8e943a08 100644 --- a/src/uml/qumldeploymenttarget.cpp +++ b/src/uml/qumldeploymenttarget.cpp @@ -39,17 +39,12 @@ ** ****************************************************************************/ #include "qumldeploymenttarget.h" -#include "qumldeploymenttarget_p.h" #include <QtUml/QUmlDeployment> #include <QtUml/QUmlPackageableElement> QT_BEGIN_NAMESPACE -QUmlDeploymentTargetPrivate::QUmlDeploymentTargetPrivate() -{ -} - /*! \class QUmlDeploymentTarget @@ -58,11 +53,8 @@ QUmlDeploymentTargetPrivate::QUmlDeploymentTargetPrivate() \brief A deployment target is the location for a deployed artifact. */ -QUmlDeploymentTarget::QUmlDeploymentTarget(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlDeploymentTarget::QUmlDeploymentTarget() { - if (create_d_ptr) - set_d_ptr(new QUmlDeploymentTargetPrivate); } // OWNED ATTRIBUTES @@ -86,17 +78,15 @@ QSet<QUmlDeployment *> QUmlDeploymentTarget::deployment() const { // This is a read-write association end - QM_D(const QUmlDeploymentTarget); - return d->deployment; + return _deployment; } void QUmlDeploymentTarget::addDeployment(QUmlDeployment *deployment) { // This is a read-write association end - QM_D(QUmlDeploymentTarget); - if (!d->deployment.contains(deployment)) { - d->deployment.insert(deployment); + if (!_deployment.contains(deployment)) { + _deployment.insert(deployment); } } @@ -104,9 +94,8 @@ void QUmlDeploymentTarget::removeDeployment(QUmlDeployment *deployment) { // This is a read-write association end - QM_D(QUmlDeploymentTarget); - if (d->deployment.contains(deployment)) { - d->deployment.remove(deployment); + if (_deployment.contains(deployment)) { + _deployment.remove(deployment); } } diff --git a/src/uml/qumldeploymenttarget.h b/src/uml/qumldeploymenttarget.h index 310d5fb2..19dd66c9 100644 --- a/src/uml/qumldeploymenttarget.h +++ b/src/uml/qumldeploymenttarget.h @@ -54,17 +54,19 @@ QT_MODULE(QtUml) class QUmlDeployment; class QUmlPackageableElement; -class QUmlDeploymentTargetPrivate; class Q_UML_EXPORT QUmlDeploymentTarget : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlDeploymentTarget(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlDeploymentTarget(); // Owned attributes QSet<QUmlPackageableElement *> deployedElement() const; QSet<QUmlDeployment *> deployment() const; void addDeployment(QUmlDeployment *deployment); void removeDeployment(QUmlDeployment *deployment); + +protected: + QSet<QUmlDeployment *> _deployment; }; QT_END_NAMESPACE diff --git a/src/uml/qumldeploymenttarget_p.h b/src/uml/qumldeploymenttarget_p.h deleted file mode 100644 index 56f71d59..00000000 --- a/src/uml/qumldeploymenttarget_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDEPLOYMENTTARGET_P_H -#define QUMLDEPLOYMENTTARGET_P_H - -#include "QtUml/QUmlDeploymentTarget" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDeploymentTargetPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlDeploymentTargetPrivate(); - - QSet<QUmlDeployment *> deployment; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDEPLOYMENTTARGET_P_H - diff --git a/src/uml/qumldestroylinkaction.cpp b/src/uml/qumldestroylinkaction.cpp index 81f40daf..e161e88e 100644 --- a/src/uml/qumldestroylinkaction.cpp +++ b/src/uml/qumldestroylinkaction.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumldestroylinkaction.h" -#include "qumldestroylinkaction_p.h" #include <QtUml/QUmlLinkEndDestructionData> QT_BEGIN_NAMESPACE -QUmlDestroyLinkActionPrivate::QUmlDestroyLinkActionPrivate() -{ -} - /*! \class QUmlDestroyLinkAction @@ -57,11 +52,8 @@ QUmlDestroyLinkActionPrivate::QUmlDestroyLinkActionPrivate() \brief A destroy link action is a write link action that destroys links and link objects. */ -QUmlDestroyLinkAction::QUmlDestroyLinkAction(bool create_d_ptr) : - QUmlWriteLinkAction(false) +QUmlDestroyLinkAction::QUmlDestroyLinkAction() { - if (create_d_ptr) - set_d_ptr(new QUmlDestroyLinkActionPrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QSet<QUmlLinkEndDestructionData *> QUmlDestroyLinkAction::endData() const { // This is a read-write association end - QM_D(const QUmlDestroyLinkAction); - return d->endData; + return _endData; } void QUmlDestroyLinkAction::addEndData(QUmlLinkEndDestructionData *endData) { // This is a read-write association end - QM_D(QUmlDestroyLinkAction); - if (!d->endData.contains(endData)) { - d->endData.insert(endData); + if (!_endData.contains(endData)) { + _endData.insert(endData); } } @@ -91,9 +81,8 @@ void QUmlDestroyLinkAction::removeEndData(QUmlLinkEndDestructionData *endData) { // This is a read-write association end - QM_D(QUmlDestroyLinkAction); - if (d->endData.contains(endData)) { - d->endData.remove(endData); + if (_endData.contains(endData)) { + _endData.remove(endData); } } diff --git a/src/uml/qumldestroylinkaction.h b/src/uml/qumldestroylinkaction.h index 9d4ad7f7..05c75d67 100644 --- a/src/uml/qumldestroylinkaction.h +++ b/src/uml/qumldestroylinkaction.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlLinkEndDestructionData; -class QUmlDestroyLinkActionPrivate; class Q_UML_EXPORT QUmlDestroyLinkAction : public QUmlWriteLinkAction { public: - QUmlDestroyLinkAction(bool create_d_ptr = true); + QUmlDestroyLinkAction(); // Owned attributes QSet<QUmlLinkEndDestructionData *> endData() const; void addEndData(QUmlLinkEndDestructionData *endData); void removeEndData(QUmlLinkEndDestructionData *endData); + +protected: + QSet<QUmlLinkEndDestructionData *> _endData; }; QT_END_NAMESPACE diff --git a/src/uml/qumldestroylinkaction_p.h b/src/uml/qumldestroylinkaction_p.h deleted file mode 100644 index 76269193..00000000 --- a/src/uml/qumldestroylinkaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDESTROYLINKACTION_P_H -#define QUMLDESTROYLINKACTION_P_H - -#include "QtUml/QUmlDestroyLinkAction" - -#include "private/qumlwritelinkaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDestroyLinkActionPrivate : public QUmlWriteLinkActionPrivate -{ -public: - QUmlDestroyLinkActionPrivate(); - - QSet<QUmlLinkEndDestructionData *> endData; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDESTROYLINKACTION_P_H - diff --git a/src/uml/qumldestroyobjectaction.cpp b/src/uml/qumldestroyobjectaction.cpp index 92358058..b285a038 100644 --- a/src/uml/qumldestroyobjectaction.cpp +++ b/src/uml/qumldestroyobjectaction.cpp @@ -39,19 +39,11 @@ ** ****************************************************************************/ #include "qumldestroyobjectaction.h" -#include "qumldestroyobjectaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlDestroyObjectActionPrivate::QUmlDestroyObjectActionPrivate() : - isDestroyLinks(false), - isDestroyOwnedObjects(false), - target(0) -{ -} - /*! \class QUmlDestroyObjectAction @@ -60,11 +52,11 @@ QUmlDestroyObjectActionPrivate::QUmlDestroyObjectActionPrivate() : \brief A destroy object action is an action that destroys objects. */ -QUmlDestroyObjectAction::QUmlDestroyObjectAction(bool create_d_ptr) : - QUmlAction(false) +QUmlDestroyObjectAction::QUmlDestroyObjectAction() : + _isDestroyLinks(false), + _isDestroyOwnedObjects(false), + _target(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDestroyObjectActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ bool QUmlDestroyObjectAction::isDestroyLinks() const { // This is a read-write property - QM_D(const QUmlDestroyObjectAction); - return d->isDestroyLinks; + return _isDestroyLinks; } void QUmlDestroyObjectAction::setDestroyLinks(bool isDestroyLinks) { // This is a read-write property - QM_D(QUmlDestroyObjectAction); - if (d->isDestroyLinks != isDestroyLinks) { - d->isDestroyLinks = isDestroyLinks; + if (_isDestroyLinks != isDestroyLinks) { + _isDestroyLinks = isDestroyLinks; } } @@ -97,17 +87,15 @@ bool QUmlDestroyObjectAction::isDestroyOwnedObjects() const { // This is a read-write property - QM_D(const QUmlDestroyObjectAction); - return d->isDestroyOwnedObjects; + return _isDestroyOwnedObjects; } void QUmlDestroyObjectAction::setDestroyOwnedObjects(bool isDestroyOwnedObjects) { // This is a read-write property - QM_D(QUmlDestroyObjectAction); - if (d->isDestroyOwnedObjects != isDestroyOwnedObjects) { - d->isDestroyOwnedObjects = isDestroyOwnedObjects; + if (_isDestroyOwnedObjects != isDestroyOwnedObjects) { + _isDestroyOwnedObjects = isDestroyOwnedObjects; } } @@ -118,17 +106,15 @@ QUmlInputPin *QUmlDestroyObjectAction::target() const { // This is a read-write association end - QM_D(const QUmlDestroyObjectAction); - return d->target; + return _target; } void QUmlDestroyObjectAction::setTarget(QUmlInputPin *target) { // This is a read-write association end - QM_D(QUmlDestroyObjectAction); - if (d->target != target) { - d->target = target; + if (_target != target) { + _target = target; } } diff --git a/src/uml/qumldestroyobjectaction.h b/src/uml/qumldestroyobjectaction.h index 014e7600..7d0504f4 100644 --- a/src/uml/qumldestroyobjectaction.h +++ b/src/uml/qumldestroyobjectaction.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlDestroyObjectActionPrivate; class Q_UML_EXPORT QUmlDestroyObjectAction : public QUmlAction { public: - QUmlDestroyObjectAction(bool create_d_ptr = true); + QUmlDestroyObjectAction(); // Owned attributes bool isDestroyLinks() const; @@ -66,6 +65,11 @@ public: void setDestroyOwnedObjects(bool isDestroyOwnedObjects); QUmlInputPin *target() const; void setTarget(QUmlInputPin *target); + +protected: + bool _isDestroyLinks; + bool _isDestroyOwnedObjects; + QUmlInputPin *_target; }; QT_END_NAMESPACE diff --git a/src/uml/qumldestroyobjectaction_p.h b/src/uml/qumldestroyobjectaction_p.h deleted file mode 100644 index 522acc22..00000000 --- a/src/uml/qumldestroyobjectaction_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDESTROYOBJECTACTION_P_H -#define QUMLDESTROYOBJECTACTION_P_H - -#include "QtUml/QUmlDestroyObjectAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDestroyObjectActionPrivate : public QUmlActionPrivate -{ -public: - QUmlDestroyObjectActionPrivate(); - - bool isDestroyLinks; - bool isDestroyOwnedObjects; - QUmlInputPin *target; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDESTROYOBJECTACTION_P_H - diff --git a/src/uml/qumldestructionoccurrencespecification.cpp b/src/uml/qumldestructionoccurrencespecification.cpp index b3ace726..5913e5d4 100644 --- a/src/uml/qumldestructionoccurrencespecification.cpp +++ b/src/uml/qumldestructionoccurrencespecification.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumldestructionoccurrencespecification.h" -#include "qumldestructionoccurrencespecification_p.h" QT_BEGIN_NAMESPACE -QUmlDestructionOccurrenceSpecificationPrivate::QUmlDestructionOccurrenceSpecificationPrivate() -{ -} - /*! \class QUmlDestructionOccurrenceSpecification @@ -55,11 +50,8 @@ QUmlDestructionOccurrenceSpecificationPrivate::QUmlDestructionOccurrenceSpecific \brief A destruction event models the destruction of an object. */ -QUmlDestructionOccurrenceSpecification::QUmlDestructionOccurrenceSpecification(bool create_d_ptr) : - QUmlMessageOccurrenceSpecification(false) +QUmlDestructionOccurrenceSpecification::QUmlDestructionOccurrenceSpecification() { - if (create_d_ptr) - set_d_ptr(new QUmlDestructionOccurrenceSpecificationPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumldestructionoccurrencespecification.h b/src/uml/qumldestructionoccurrencespecification.h index 2f734545..de780d97 100644 --- a/src/uml/qumldestructionoccurrencespecification.h +++ b/src/uml/qumldestructionoccurrencespecification.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlDestructionOccurrenceSpecificationPrivate; class Q_UML_EXPORT QUmlDestructionOccurrenceSpecification : public QUmlMessageOccurrenceSpecification { public: - QUmlDestructionOccurrenceSpecification(bool create_d_ptr = true); + QUmlDestructionOccurrenceSpecification(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumldestructionoccurrencespecification_p.h b/src/uml/qumldestructionoccurrencespecification_p.h deleted file mode 100644 index db36060f..00000000 --- a/src/uml/qumldestructionoccurrencespecification_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDESTRUCTIONOCCURRENCESPECIFICATION_P_H -#define QUMLDESTRUCTIONOCCURRENCESPECIFICATION_P_H - -#include "QtUml/QUmlDestructionOccurrenceSpecification" - -#include "private/qumlmessageoccurrencespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDestructionOccurrenceSpecificationPrivate : public QUmlMessageOccurrenceSpecificationPrivate -{ -public: - QUmlDestructionOccurrenceSpecificationPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDESTRUCTIONOCCURRENCESPECIFICATION_P_H - diff --git a/src/uml/qumldevice.cpp b/src/uml/qumldevice.cpp index 965eb7c7..847004ec 100644 --- a/src/uml/qumldevice.cpp +++ b/src/uml/qumldevice.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumldevice.h" -#include "qumldevice_p.h" QT_BEGIN_NAMESPACE -QUmlDevicePrivate::QUmlDevicePrivate() -{ -} - /*! \class QUmlDevice @@ -55,11 +50,8 @@ QUmlDevicePrivate::QUmlDevicePrivate() \brief A device is a physical computational resource with processing capability upon which artifacts may be deployed for execution. Devices may be complex (i.e., they may consist of other devices). */ -QUmlDevice::QUmlDevice(bool create_d_ptr) : - QUmlNode(false) +QUmlDevice::QUmlDevice() { - if (create_d_ptr) - set_d_ptr(new QUmlDevicePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumldevice.h b/src/uml/qumldevice.h index c7a7c526..0c419115 100644 --- a/src/uml/qumldevice.h +++ b/src/uml/qumldevice.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlDevicePrivate; class Q_UML_EXPORT QUmlDevice : public QUmlNode { public: - QUmlDevice(bool create_d_ptr = true); + QUmlDevice(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumldevice_p.h b/src/uml/qumldevice_p.h deleted file mode 100644 index 9bf79366..00000000 --- a/src/uml/qumldevice_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDEVICE_P_H -#define QUMLDEVICE_P_H - -#include "QtUml/QUmlDevice" - -#include "private/qumlnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDevicePrivate : public QUmlNodePrivate -{ -public: - QUmlDevicePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDEVICE_P_H - diff --git a/src/uml/qumldirectedrelationship.cpp b/src/uml/qumldirectedrelationship.cpp index 10ccddb5..a2c249c2 100644 --- a/src/uml/qumldirectedrelationship.cpp +++ b/src/uml/qumldirectedrelationship.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumldirectedrelationship.h" -#include "qumldirectedrelationship_p.h" #include <QtUml/QUmlElement> QT_BEGIN_NAMESPACE -QUmlDirectedRelationshipPrivate::QUmlDirectedRelationshipPrivate() -{ -} - /*! \class QUmlDirectedRelationship @@ -57,11 +52,8 @@ QUmlDirectedRelationshipPrivate::QUmlDirectedRelationshipPrivate() \brief A directed relationship represents a relationship between a collection of source model elements and a collection of target model elements. */ -QUmlDirectedRelationship::QUmlDirectedRelationship(bool create_d_ptr) : - QUmlRelationship(false) +QUmlDirectedRelationship::QUmlDirectedRelationship() { - if (create_d_ptr) - set_d_ptr(new QUmlDirectedRelationshipPrivate); } // OWNED ATTRIBUTES @@ -73,8 +65,7 @@ QSet<QUmlElement *> QUmlDirectedRelationship::source() const { // This is a read-only derived union association end - QM_D(const QUmlDirectedRelationship); - return d->source; + return _source; } /*! @@ -84,8 +75,7 @@ QSet<QUmlElement *> QUmlDirectedRelationship::target() const { // This is a read-only derived union association end - QM_D(const QUmlDirectedRelationship); - return d->target; + return _target; } QT_END_NAMESPACE diff --git a/src/uml/qumldirectedrelationship.h b/src/uml/qumldirectedrelationship.h index 5461cb74..aa45e486 100644 --- a/src/uml/qumldirectedrelationship.h +++ b/src/uml/qumldirectedrelationship.h @@ -53,15 +53,18 @@ QT_MODULE(QtUml) class QUmlElement; -class QUmlDirectedRelationshipPrivate; class Q_UML_EXPORT QUmlDirectedRelationship : public QUmlRelationship { public: - Q_DECL_HIDDEN QUmlDirectedRelationship(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlDirectedRelationship(); // Owned attributes QSet<QUmlElement *> source() const; QSet<QUmlElement *> target() const; + +protected: + QSet<QUmlElement *> _source; + QSet<QUmlElement *> _target; }; QT_END_NAMESPACE diff --git a/src/uml/qumldirectedrelationship_p.h b/src/uml/qumldirectedrelationship_p.h deleted file mode 100644 index 590fc7de..00000000 --- a/src/uml/qumldirectedrelationship_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDIRECTEDRELATIONSHIP_P_H -#define QUMLDIRECTEDRELATIONSHIP_P_H - -#include "QtUml/QUmlDirectedRelationship" - -#include "private/qumlrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDirectedRelationshipPrivate : public QUmlRelationshipPrivate -{ -public: - QUmlDirectedRelationshipPrivate(); - - QSet<QUmlElement *> source; - QSet<QUmlElement *> target; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDIRECTEDRELATIONSHIP_P_H - diff --git a/src/uml/qumlduration.cpp b/src/uml/qumlduration.cpp index 33b85358..9db543a0 100644 --- a/src/uml/qumlduration.cpp +++ b/src/uml/qumlduration.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlduration.h" -#include "qumlduration_p.h" #include <QtUml/QUmlObservation> QT_BEGIN_NAMESPACE -QUmlDurationPrivate::QUmlDurationPrivate() : - expr(0) -{ -} - /*! \class QUmlDuration @@ -58,11 +52,9 @@ QUmlDurationPrivate::QUmlDurationPrivate() : \brief Duration defines a value specification that specifies the temporal distance between two time instants. */ -QUmlDuration::QUmlDuration(bool create_d_ptr) : - QUmlValueSpecification(false) +QUmlDuration::QUmlDuration() : + _expr(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDurationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlValueSpecification *QUmlDuration::expr() const { // This is a read-write association end - QM_D(const QUmlDuration); - return d->expr; + return _expr; } void QUmlDuration::setExpr(QUmlValueSpecification *expr) { // This is a read-write association end - QM_D(QUmlDuration); - if (d->expr != expr) { - d->expr = expr; + if (_expr != expr) { + _expr = expr; } } @@ -95,17 +85,15 @@ QSet<QUmlObservation *> QUmlDuration::observation() const { // This is a read-write association end - QM_D(const QUmlDuration); - return d->observation; + return _observation; } void QUmlDuration::addObservation(QUmlObservation *observation) { // This is a read-write association end - QM_D(QUmlDuration); - if (!d->observation.contains(observation)) { - d->observation.insert(observation); + if (!_observation.contains(observation)) { + _observation.insert(observation); } } @@ -113,9 +101,8 @@ void QUmlDuration::removeObservation(QUmlObservation *observation) { // This is a read-write association end - QM_D(QUmlDuration); - if (d->observation.contains(observation)) { - d->observation.remove(observation); + if (_observation.contains(observation)) { + _observation.remove(observation); } } diff --git a/src/uml/qumlduration.h b/src/uml/qumlduration.h index 1fabc05c..8514131f 100644 --- a/src/uml/qumlduration.h +++ b/src/uml/qumlduration.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlObservation; -class QUmlDurationPrivate; class Q_UML_EXPORT QUmlDuration : public QUmlValueSpecification { public: - QUmlDuration(bool create_d_ptr = true); + QUmlDuration(); // Owned attributes QUmlValueSpecification *expr() const; @@ -65,6 +64,10 @@ public: QSet<QUmlObservation *> observation() const; void addObservation(QUmlObservation *observation); void removeObservation(QUmlObservation *observation); + +protected: + QUmlValueSpecification *_expr; + QSet<QUmlObservation *> _observation; }; QT_END_NAMESPACE diff --git a/src/uml/qumlduration_p.h b/src/uml/qumlduration_p.h deleted file mode 100644 index 2a53adc7..00000000 --- a/src/uml/qumlduration_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDURATION_P_H -#define QUMLDURATION_P_H - -#include "QtUml/QUmlDuration" - -#include "private/qumlvaluespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDurationPrivate : public QUmlValueSpecificationPrivate -{ -public: - QUmlDurationPrivate(); - - QUmlValueSpecification *expr; - QSet<QUmlObservation *> observation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDURATION_P_H - diff --git a/src/uml/qumldurationconstraint.cpp b/src/uml/qumldurationconstraint.cpp index aaa2dc3c..65397210 100644 --- a/src/uml/qumldurationconstraint.cpp +++ b/src/uml/qumldurationconstraint.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumldurationconstraint.h" -#include "qumldurationconstraint_p.h" #include <QtUml/QUmlDurationInterval> QT_BEGIN_NAMESPACE -QUmlDurationConstraintPrivate::QUmlDurationConstraintPrivate() : - specification(0) -{ -} - /*! \class QUmlDurationConstraint @@ -58,11 +52,9 @@ QUmlDurationConstraintPrivate::QUmlDurationConstraintPrivate() : \brief A duration constraint is a constraint that refers to a duration interval. */ -QUmlDurationConstraint::QUmlDurationConstraint(bool create_d_ptr) : - QUmlIntervalConstraint(false) +QUmlDurationConstraint::QUmlDurationConstraint() : + _specification(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDurationConstraintPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ bool QUmlDurationConstraint::firstEvent() const { // This is a read-write property - QM_D(const QUmlDurationConstraint); - return d->firstEvent; + return _firstEvent; } void QUmlDurationConstraint::setFirstEvent(bool firstEvent) { // This is a read-write property - QM_D(QUmlDurationConstraint); - if (d->firstEvent != firstEvent) { - d->firstEvent = firstEvent; + if (_firstEvent != firstEvent) { + _firstEvent = firstEvent; } } @@ -95,17 +85,15 @@ QUmlDurationInterval *QUmlDurationConstraint::specification() const { // This is a read-write association end - QM_D(const QUmlDurationConstraint); - return d->specification; + return _specification; } void QUmlDurationConstraint::setSpecification(QUmlDurationInterval *specification) { // This is a read-write association end - QM_D(QUmlDurationConstraint); - if (d->specification != specification) { - d->specification = specification; + if (_specification != specification) { + _specification = specification; } } diff --git a/src/uml/qumldurationconstraint.h b/src/uml/qumldurationconstraint.h index 5e59b4eb..dfa566c7 100644 --- a/src/uml/qumldurationconstraint.h +++ b/src/uml/qumldurationconstraint.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlDurationInterval; -class QUmlDurationConstraintPrivate; class Q_UML_EXPORT QUmlDurationConstraint : public QUmlIntervalConstraint { public: - QUmlDurationConstraint(bool create_d_ptr = true); + QUmlDurationConstraint(); // Owned attributes bool firstEvent() const; void setFirstEvent(bool firstEvent); QUmlDurationInterval *specification() const; void setSpecification(QUmlDurationInterval *specification); + +protected: + bool _firstEvent; + QUmlDurationInterval *_specification; }; QT_END_NAMESPACE diff --git a/src/uml/qumldurationconstraint_p.h b/src/uml/qumldurationconstraint_p.h deleted file mode 100644 index 7bcc0a50..00000000 --- a/src/uml/qumldurationconstraint_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDURATIONCONSTRAINT_P_H -#define QUMLDURATIONCONSTRAINT_P_H - -#include "QtUml/QUmlDurationConstraint" - -#include "private/qumlintervalconstraint_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDurationConstraintPrivate : public QUmlIntervalConstraintPrivate -{ -public: - QUmlDurationConstraintPrivate(); - - bool firstEvent; - QUmlDurationInterval *specification; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDURATIONCONSTRAINT_P_H - diff --git a/src/uml/qumldurationinterval.cpp b/src/uml/qumldurationinterval.cpp index c2d5221d..7cf49d10 100644 --- a/src/uml/qumldurationinterval.cpp +++ b/src/uml/qumldurationinterval.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumldurationinterval.h" -#include "qumldurationinterval_p.h" #include <QtUml/QUmlDuration> QT_BEGIN_NAMESPACE -QUmlDurationIntervalPrivate::QUmlDurationIntervalPrivate() : - max(0), - min(0) -{ -} - /*! \class QUmlDurationInterval @@ -59,11 +52,10 @@ QUmlDurationIntervalPrivate::QUmlDurationIntervalPrivate() : \brief A duration interval defines the range between two durations. */ -QUmlDurationInterval::QUmlDurationInterval(bool create_d_ptr) : - QUmlInterval(false) +QUmlDurationInterval::QUmlDurationInterval() : + _max(0), + _min(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDurationIntervalPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlDuration *QUmlDurationInterval::max() const { // This is a read-write association end - QM_D(const QUmlDurationInterval); - return d->max; + return _max; } void QUmlDurationInterval::setMax(QUmlDuration *max) { // This is a read-write association end - QM_D(QUmlDurationInterval); - if (d->max != max) { - d->max = max; + if (_max != max) { + _max = max; } } @@ -96,17 +86,15 @@ QUmlDuration *QUmlDurationInterval::min() const { // This is a read-write association end - QM_D(const QUmlDurationInterval); - return d->min; + return _min; } void QUmlDurationInterval::setMin(QUmlDuration *min) { // This is a read-write association end - QM_D(QUmlDurationInterval); - if (d->min != min) { - d->min = min; + if (_min != min) { + _min = min; } } diff --git a/src/uml/qumldurationinterval.h b/src/uml/qumldurationinterval.h index 1c30fc75..5c0cdf9d 100644 --- a/src/uml/qumldurationinterval.h +++ b/src/uml/qumldurationinterval.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlDuration; -class QUmlDurationIntervalPrivate; class Q_UML_EXPORT QUmlDurationInterval : public QUmlInterval { public: - QUmlDurationInterval(bool create_d_ptr = true); + QUmlDurationInterval(); // Owned attributes QUmlDuration *max() const; void setMax(QUmlDuration *max); QUmlDuration *min() const; void setMin(QUmlDuration *min); + +protected: + QUmlDuration *_max; + QUmlDuration *_min; }; QT_END_NAMESPACE diff --git a/src/uml/qumldurationinterval_p.h b/src/uml/qumldurationinterval_p.h deleted file mode 100644 index 843cf8f0..00000000 --- a/src/uml/qumldurationinterval_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDURATIONINTERVAL_P_H -#define QUMLDURATIONINTERVAL_P_H - -#include "QtUml/QUmlDurationInterval" - -#include "private/qumlinterval_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDurationIntervalPrivate : public QUmlIntervalPrivate -{ -public: - QUmlDurationIntervalPrivate(); - - QUmlDuration *max; - QUmlDuration *min; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDURATIONINTERVAL_P_H - diff --git a/src/uml/qumldurationobservation.cpp b/src/uml/qumldurationobservation.cpp index 644d3d76..4d7539c6 100644 --- a/src/uml/qumldurationobservation.cpp +++ b/src/uml/qumldurationobservation.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumldurationobservation.h" -#include "qumldurationobservation_p.h" #include <QtUml/QUmlNamedElement> QT_BEGIN_NAMESPACE -QUmlDurationObservationPrivate::QUmlDurationObservationPrivate() : - event(0) -{ -} - /*! \class QUmlDurationObservation @@ -58,11 +52,9 @@ QUmlDurationObservationPrivate::QUmlDurationObservationPrivate() : \brief A duration observation is a reference to a duration during an execution. It points out the element(s) in the model to observe and whether the observations are when this model element is entered or when it is exited. */ -QUmlDurationObservation::QUmlDurationObservation(bool create_d_ptr) : - QUmlObservation(false) +QUmlDurationObservation::QUmlDurationObservation() : + _event(0) { - if (create_d_ptr) - set_d_ptr(new QUmlDurationObservationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlNamedElement *QUmlDurationObservation::event() const { // This is a read-write association end - QM_D(const QUmlDurationObservation); - return d->event; + return _event; } void QUmlDurationObservation::setEvent(QUmlNamedElement *event) { // This is a read-write association end - QM_D(QUmlDurationObservation); - if (d->event != event) { - d->event = event; + if (_event != event) { + _event = event; } } @@ -95,17 +85,15 @@ bool QUmlDurationObservation::firstEvent() const { // This is a read-write property - QM_D(const QUmlDurationObservation); - return d->firstEvent; + return _firstEvent; } void QUmlDurationObservation::setFirstEvent(bool firstEvent) { // This is a read-write property - QM_D(QUmlDurationObservation); - if (d->firstEvent != firstEvent) { - d->firstEvent = firstEvent; + if (_firstEvent != firstEvent) { + _firstEvent = firstEvent; } } diff --git a/src/uml/qumldurationobservation.h b/src/uml/qumldurationobservation.h index 3a899096..ef7320cd 100644 --- a/src/uml/qumldurationobservation.h +++ b/src/uml/qumldurationobservation.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlNamedElement; -class QUmlDurationObservationPrivate; class Q_UML_EXPORT QUmlDurationObservation : public QUmlObservation { public: - QUmlDurationObservation(bool create_d_ptr = true); + QUmlDurationObservation(); // Owned attributes QUmlNamedElement *event() const; void setEvent(QUmlNamedElement *event); bool firstEvent() const; void setFirstEvent(bool firstEvent); + +protected: + QUmlNamedElement *_event; + bool _firstEvent; }; QT_END_NAMESPACE diff --git a/src/uml/qumldurationobservation_p.h b/src/uml/qumldurationobservation_p.h deleted file mode 100644 index ebf8ed89..00000000 --- a/src/uml/qumldurationobservation_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLDURATIONOBSERVATION_P_H -#define QUMLDURATIONOBSERVATION_P_H - -#include "QtUml/QUmlDurationObservation" - -#include "private/qumlobservation_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlDurationObservationPrivate : public QUmlObservationPrivate -{ -public: - QUmlDurationObservationPrivate(); - - QUmlNamedElement *event; - bool firstEvent; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLDURATIONOBSERVATION_P_H - diff --git a/src/uml/qumlelement.cpp b/src/uml/qumlelement.cpp index 6c8f26e3..deb5a598 100644 --- a/src/uml/qumlelement.cpp +++ b/src/uml/qumlelement.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlelement.h" -#include "qumlelement_p.h" #include <QtUml/QUmlComment> QT_BEGIN_NAMESPACE -QUmlElementPrivate::QUmlElementPrivate() : - owner(0) -{ -} - /*! \class QUmlElement @@ -58,11 +52,9 @@ QUmlElementPrivate::QUmlElementPrivate() : \brief An element is a constituent of a model. As such, it has the capability of owning other elements. */ -QUmlElement::QUmlElement(bool create_d_ptr) : - QModelingObject(false) +QUmlElement::QUmlElement() : + _owner(0) { - if (create_d_ptr) - set_d_ptr(new QUmlElementPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QSet<QUmlComment *> QUmlElement::ownedComment() const { // This is a read-write association end - QM_D(const QUmlElement); - return d->ownedComment; + return _ownedComment; } void QUmlElement::addOwnedComment(QUmlComment *ownedComment) { // This is a read-write association end - QM_D(QUmlElement); - if (!d->ownedComment.contains(ownedComment)) { - d->ownedComment.insert(ownedComment); + if (!_ownedComment.contains(ownedComment)) { + _ownedComment.insert(ownedComment); } } @@ -92,9 +82,8 @@ void QUmlElement::removeOwnedComment(QUmlComment *ownedComment) { // This is a read-write association end - QM_D(QUmlElement); - if (d->ownedComment.contains(ownedComment)) { - d->ownedComment.remove(ownedComment); + if (_ownedComment.contains(ownedComment)) { + _ownedComment.remove(ownedComment); } } @@ -105,8 +94,7 @@ QSet<QUmlElement *> QUmlElement::ownedElement() const { // This is a read-only derived union association end - QM_D(const QUmlElement); - return d->ownedElement; + return _ownedElement; } /*! @@ -116,8 +104,7 @@ QUmlElement *QUmlElement::owner() const { // This is a read-only derived union association end - QM_D(const QUmlElement); - return d->owner; + return _owner; } // OPERATIONS diff --git a/src/uml/qumlelement.h b/src/uml/qumlelement.h index 572b626f..08b2fe81 100644 --- a/src/uml/qumlelement.h +++ b/src/uml/qumlelement.h @@ -52,11 +52,10 @@ QT_MODULE(QtUml) class QUmlComment; -class QUmlElementPrivate; class Q_UML_EXPORT QUmlElement : public QModelingObject { public: - Q_DECL_HIDDEN QUmlElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlElement(); // Owned attributes QSet<QUmlComment *> ownedComment() const; @@ -68,6 +67,11 @@ public: // Operations QSet<QUmlElement *> allOwnedElements() const; bool mustBeOwned() const; + +protected: + QSet<QUmlComment *> _ownedComment; + QSet<QUmlElement *> _ownedElement; + QUmlElement *_owner; }; QT_END_NAMESPACE diff --git a/src/uml/qumlelement_p.h b/src/uml/qumlelement_p.h deleted file mode 100644 index 20f5beae..00000000 --- a/src/uml/qumlelement_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLELEMENT_P_H -#define QUMLELEMENT_P_H - -#include "QtUml/QUmlElement" - -#include "private/qmodelingobject_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlElementPrivate : public QModelingObjectPrivate -{ -public: - QUmlElementPrivate(); - - QSet<QUmlComment *> ownedComment; - QSet<QUmlElement *> ownedElement; - QUmlElement *owner; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLELEMENT_P_H - diff --git a/src/uml/qumlelementimport.cpp b/src/uml/qumlelementimport.cpp index dd7e252a..6d4272e3 100644 --- a/src/uml/qumlelementimport.cpp +++ b/src/uml/qumlelementimport.cpp @@ -39,20 +39,12 @@ ** ****************************************************************************/ #include "qumlelementimport.h" -#include "qumlelementimport_p.h" #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackageableElement> QT_BEGIN_NAMESPACE -QUmlElementImportPrivate::QUmlElementImportPrivate() : - importedElement(0), - importingNamespace(0), - visibility(QtUml::VisibilityPublic) -{ -} - /*! \class QUmlElementImport @@ -61,11 +53,11 @@ QUmlElementImportPrivate::QUmlElementImportPrivate() : \brief An element import identifies an element in another package, and allows the element to be referenced using its name without a qualifier. */ -QUmlElementImport::QUmlElementImport(bool create_d_ptr) : - QUmlDirectedRelationship(false) +QUmlElementImport::QUmlElementImport() : + _importedElement(0), + _importingNamespace(0), + _visibility(QtUml::VisibilityPublic) { - if (create_d_ptr) - set_d_ptr(new QUmlElementImportPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QString QUmlElementImport::alias() const { // This is a read-write property - QM_D(const QUmlElementImport); - return d->alias; + return _alias; } void QUmlElementImport::setAlias(QString alias) { // This is a read-write property - QM_D(QUmlElementImport); - if (d->alias != alias) { - d->alias = alias; + if (_alias != alias) { + _alias = alias; } } @@ -98,17 +88,15 @@ QUmlPackageableElement *QUmlElementImport::importedElement() const { // This is a read-write association end - QM_D(const QUmlElementImport); - return d->importedElement; + return _importedElement; } void QUmlElementImport::setImportedElement(QUmlPackageableElement *importedElement) { // This is a read-write association end - QM_D(QUmlElementImport); - if (d->importedElement != importedElement) { - d->importedElement = importedElement; + if (_importedElement != importedElement) { + _importedElement = importedElement; } } @@ -119,17 +107,15 @@ QUmlNamespace *QUmlElementImport::importingNamespace() const { // This is a read-write association end - QM_D(const QUmlElementImport); - return d->importingNamespace; + return _importingNamespace; } void QUmlElementImport::setImportingNamespace(QUmlNamespace *importingNamespace) { // This is a read-write association end - QM_D(QUmlElementImport); - if (d->importingNamespace != importingNamespace) { - d->importingNamespace = importingNamespace; + if (_importingNamespace != importingNamespace) { + _importingNamespace = importingNamespace; } } @@ -140,17 +126,15 @@ QtUml::VisibilityKind QUmlElementImport::visibility() const { // This is a read-write property - QM_D(const QUmlElementImport); - return d->visibility; + return _visibility; } void QUmlElementImport::setVisibility(QtUml::VisibilityKind visibility) { // This is a read-write property - QM_D(QUmlElementImport); - if (d->visibility != visibility) { - d->visibility = visibility; + if (_visibility != visibility) { + _visibility = visibility; } } diff --git a/src/uml/qumlelementimport.h b/src/uml/qumlelementimport.h index 76081962..b09ae851 100644 --- a/src/uml/qumlelementimport.h +++ b/src/uml/qumlelementimport.h @@ -55,11 +55,10 @@ QT_MODULE(QtUml) class QUmlNamespace; class QUmlPackageableElement; -class QUmlElementImportPrivate; class Q_UML_EXPORT QUmlElementImport : public QUmlDirectedRelationship { public: - QUmlElementImport(bool create_d_ptr = true); + QUmlElementImport(); // Owned attributes QString alias() const; @@ -73,6 +72,12 @@ public: // Operations QString getName() const; + +protected: + QString _alias; + QUmlPackageableElement *_importedElement; + QUmlNamespace *_importingNamespace; + QtUml::VisibilityKind _visibility; }; QT_END_NAMESPACE diff --git a/src/uml/qumlelementimport_p.h b/src/uml/qumlelementimport_p.h deleted file mode 100644 index cf4fb06e..00000000 --- a/src/uml/qumlelementimport_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLELEMENTIMPORT_P_H -#define QUMLELEMENTIMPORT_P_H - -#include "QtUml/QUmlElementImport" - -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlElementImportPrivate : public QUmlDirectedRelationshipPrivate -{ -public: - QUmlElementImportPrivate(); - - QString alias; - QUmlPackageableElement *importedElement; - QUmlNamespace *importingNamespace; - QtUml::VisibilityKind visibility; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLELEMENTIMPORT_P_H - diff --git a/src/uml/qumlencapsulatedclassifier.cpp b/src/uml/qumlencapsulatedclassifier.cpp index 24f7ca28..bd077906 100644 --- a/src/uml/qumlencapsulatedclassifier.cpp +++ b/src/uml/qumlencapsulatedclassifier.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlencapsulatedclassifier.h" -#include "qumlencapsulatedclassifier_p.h" #include <QtUml/QUmlPort> QT_BEGIN_NAMESPACE -QUmlEncapsulatedClassifierPrivate::QUmlEncapsulatedClassifierPrivate() -{ -} - /*! \class QUmlEncapsulatedClassifier @@ -57,11 +52,8 @@ QUmlEncapsulatedClassifierPrivate::QUmlEncapsulatedClassifierPrivate() \brief A classifier has the ability to own ports as specific and type checked interaction points. */ -QUmlEncapsulatedClassifier::QUmlEncapsulatedClassifier(bool create_d_ptr) : - QUmlStructuredClassifier(false) +QUmlEncapsulatedClassifier::QUmlEncapsulatedClassifier() { - if (create_d_ptr) - set_d_ptr(new QUmlEncapsulatedClassifierPrivate); } // OWNED ATTRIBUTES diff --git a/src/uml/qumlencapsulatedclassifier.h b/src/uml/qumlencapsulatedclassifier.h index 9917de66..f986d6ad 100644 --- a/src/uml/qumlencapsulatedclassifier.h +++ b/src/uml/qumlencapsulatedclassifier.h @@ -53,14 +53,15 @@ QT_MODULE(QtUml) class QUmlPort; -class QUmlEncapsulatedClassifierPrivate; class Q_UML_EXPORT QUmlEncapsulatedClassifier : public QUmlStructuredClassifier { public: - Q_DECL_HIDDEN QUmlEncapsulatedClassifier(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlEncapsulatedClassifier(); // Owned attributes QSet<QUmlPort *> ownedPort() const; + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlencapsulatedclassifier_p.h b/src/uml/qumlencapsulatedclassifier_p.h deleted file mode 100644 index ffc0b8f2..00000000 --- a/src/uml/qumlencapsulatedclassifier_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLENCAPSULATEDCLASSIFIER_P_H -#define QUMLENCAPSULATEDCLASSIFIER_P_H - -#include "QtUml/QUmlEncapsulatedClassifier" - -#include "private/qumlstructuredclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlEncapsulatedClassifierPrivate : public QUmlStructuredClassifierPrivate -{ -public: - QUmlEncapsulatedClassifierPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLENCAPSULATEDCLASSIFIER_P_H - diff --git a/src/uml/qumlenumeration.cpp b/src/uml/qumlenumeration.cpp index 9b796065..881bac49 100644 --- a/src/uml/qumlenumeration.cpp +++ b/src/uml/qumlenumeration.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlenumeration.h" -#include "qumlenumeration_p.h" #include <QtUml/QUmlEnumerationLiteral> QT_BEGIN_NAMESPACE -QUmlEnumerationPrivate::QUmlEnumerationPrivate() -{ -} - /*! \class QUmlEnumeration @@ -57,11 +52,8 @@ QUmlEnumerationPrivate::QUmlEnumerationPrivate() \brief An enumeration is a data type whose values are enumerated in the model as enumeration literals. */ -QUmlEnumeration::QUmlEnumeration(bool create_d_ptr) : - QUmlDataType(false) +QUmlEnumeration::QUmlEnumeration() { - if (create_d_ptr) - set_d_ptr(new QUmlEnumerationPrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QList<QUmlEnumerationLiteral *> QUmlEnumeration::ownedLiteral() const { // This is a read-write association end - QM_D(const QUmlEnumeration); - return d->ownedLiteral; + return _ownedLiteral; } void QUmlEnumeration::addOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral) { // This is a read-write association end - QM_D(QUmlEnumeration); - if (!d->ownedLiteral.contains(ownedLiteral)) { - d->ownedLiteral.append(ownedLiteral); + if (!_ownedLiteral.contains(ownedLiteral)) { + _ownedLiteral.append(ownedLiteral); } } @@ -91,9 +81,8 @@ void QUmlEnumeration::removeOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral) { // This is a read-write association end - QM_D(QUmlEnumeration); - if (d->ownedLiteral.contains(ownedLiteral)) { - d->ownedLiteral.removeAll(ownedLiteral); + if (_ownedLiteral.contains(ownedLiteral)) { + _ownedLiteral.removeAll(ownedLiteral); } } diff --git a/src/uml/qumlenumeration.h b/src/uml/qumlenumeration.h index c2b1c951..11be948b 100644 --- a/src/uml/qumlenumeration.h +++ b/src/uml/qumlenumeration.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlEnumerationLiteral; -class QUmlEnumerationPrivate; class Q_UML_EXPORT QUmlEnumeration : public QUmlDataType { public: - QUmlEnumeration(bool create_d_ptr = true); + QUmlEnumeration(); // Owned attributes QList<QUmlEnumerationLiteral *> ownedLiteral() const; void addOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral); void removeOwnedLiteral(QUmlEnumerationLiteral *ownedLiteral); + +protected: + QList<QUmlEnumerationLiteral *> _ownedLiteral; }; QT_END_NAMESPACE diff --git a/src/uml/qumlenumeration_p.h b/src/uml/qumlenumeration_p.h deleted file mode 100644 index 6e962c52..00000000 --- a/src/uml/qumlenumeration_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLENUMERATION_P_H -#define QUMLENUMERATION_P_H - -#include "QtUml/QUmlEnumeration" - -#include "private/qumldatatype_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlEnumerationPrivate : public QUmlDataTypePrivate -{ -public: - QUmlEnumerationPrivate(); - - QList<QUmlEnumerationLiteral *> ownedLiteral; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLENUMERATION_P_H - diff --git a/src/uml/qumlenumerationliteral.cpp b/src/uml/qumlenumerationliteral.cpp index e5ec5bd6..e7316695 100644 --- a/src/uml/qumlenumerationliteral.cpp +++ b/src/uml/qumlenumerationliteral.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlenumerationliteral.h" -#include "qumlenumerationliteral_p.h" #include <QtUml/QUmlEnumeration> QT_BEGIN_NAMESPACE -QUmlEnumerationLiteralPrivate::QUmlEnumerationLiteralPrivate() : - enumeration(0) -{ -} - /*! \class QUmlEnumerationLiteral @@ -58,11 +52,9 @@ QUmlEnumerationLiteralPrivate::QUmlEnumerationLiteralPrivate() : \brief An enumeration literal is a user-defined data value for an enumeration. */ -QUmlEnumerationLiteral::QUmlEnumerationLiteral(bool create_d_ptr) : - QUmlInstanceSpecification(false) +QUmlEnumerationLiteral::QUmlEnumerationLiteral() : + _enumeration(0) { - if (create_d_ptr) - set_d_ptr(new QUmlEnumerationLiteralPrivate); } // OWNED ATTRIBUTES @@ -86,17 +78,15 @@ QUmlEnumeration *QUmlEnumerationLiteral::enumeration() const { // This is a read-write association end - QM_D(const QUmlEnumerationLiteral); - return d->enumeration; + return _enumeration; } void QUmlEnumerationLiteral::setEnumeration(QUmlEnumeration *enumeration) { // This is a read-write association end - QM_D(QUmlEnumerationLiteral); - if (d->enumeration != enumeration) { - d->enumeration = enumeration; + if (_enumeration != enumeration) { + _enumeration = enumeration; } } diff --git a/src/uml/qumlenumerationliteral.h b/src/uml/qumlenumerationliteral.h index 5d9e29c5..85978902 100644 --- a/src/uml/qumlenumerationliteral.h +++ b/src/uml/qumlenumerationliteral.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlEnumeration; -class QUmlEnumerationLiteralPrivate; class Q_UML_EXPORT QUmlEnumerationLiteral : public QUmlInstanceSpecification { public: - QUmlEnumerationLiteral(bool create_d_ptr = true); + QUmlEnumerationLiteral(); // Owned attributes QUmlEnumeration *classifier() const; QUmlEnumeration *enumeration() const; void setEnumeration(QUmlEnumeration *enumeration); + +protected: + QUmlEnumeration *_enumeration; }; QT_END_NAMESPACE diff --git a/src/uml/qumlenumerationliteral_p.h b/src/uml/qumlenumerationliteral_p.h deleted file mode 100644 index 348946f1..00000000 --- a/src/uml/qumlenumerationliteral_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLENUMERATIONLITERAL_P_H -#define QUMLENUMERATIONLITERAL_P_H - -#include "QtUml/QUmlEnumerationLiteral" - -#include "private/qumlinstancespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlEnumerationLiteralPrivate : public QUmlInstanceSpecificationPrivate -{ -public: - QUmlEnumerationLiteralPrivate(); - - QUmlEnumeration *enumeration; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLENUMERATIONLITERAL_P_H - diff --git a/src/uml/qumlevent.cpp b/src/uml/qumlevent.cpp index 3905f91b..2764ad82 100644 --- a/src/uml/qumlevent.cpp +++ b/src/uml/qumlevent.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlevent.h" -#include "qumlevent_p.h" QT_BEGIN_NAMESPACE -QUmlEventPrivate::QUmlEventPrivate() -{ -} - /*! \class QUmlEvent @@ -55,11 +50,8 @@ QUmlEventPrivate::QUmlEventPrivate() \brief An event is the specification of some occurrence that may potentially trigger effects by an object. */ -QUmlEvent::QUmlEvent(bool create_d_ptr) : - QUmlPackageableElement(false) +QUmlEvent::QUmlEvent() { - if (create_d_ptr) - set_d_ptr(new QUmlEventPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlevent.h b/src/uml/qumlevent.h index 3d365d19..7eec8777 100644 --- a/src/uml/qumlevent.h +++ b/src/uml/qumlevent.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlEventPrivate; class Q_UML_EXPORT QUmlEvent : public QUmlPackageableElement { public: - Q_DECL_HIDDEN QUmlEvent(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlEvent(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlevent_p.h b/src/uml/qumlevent_p.h deleted file mode 100644 index 85cb9d6c..00000000 --- a/src/uml/qumlevent_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEVENT_P_H -#define QUMLEVENT_P_H - -#include "QtUml/QUmlEvent" - -#include "private/qumlpackageableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlEventPrivate : public QUmlPackageableElementPrivate -{ -public: - QUmlEventPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEVENT_P_H - diff --git a/src/uml/qumlexceptionhandler.cpp b/src/uml/qumlexceptionhandler.cpp index 4da678e4..98832107 100644 --- a/src/uml/qumlexceptionhandler.cpp +++ b/src/uml/qumlexceptionhandler.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlexceptionhandler.h" -#include "qumlexceptionhandler_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlExecutableNode> @@ -47,13 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlExceptionHandlerPrivate::QUmlExceptionHandlerPrivate() : - exceptionInput(0), - handlerBody(0), - protectedNode(0) -{ -} - /*! \class QUmlExceptionHandler @@ -62,11 +54,11 @@ QUmlExceptionHandlerPrivate::QUmlExceptionHandlerPrivate() : \brief An exception handler is an element that specifies a body to execute in case the specified exception occurs during the execution of the protected node. */ -QUmlExceptionHandler::QUmlExceptionHandler(bool create_d_ptr) : - QUmlElement(false) +QUmlExceptionHandler::QUmlExceptionHandler() : + _exceptionInput(0), + _handlerBody(0), + _protectedNode(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExceptionHandlerPrivate); } // OWNED ATTRIBUTES @@ -78,17 +70,15 @@ QUmlObjectNode *QUmlExceptionHandler::exceptionInput() const { // This is a read-write association end - QM_D(const QUmlExceptionHandler); - return d->exceptionInput; + return _exceptionInput; } void QUmlExceptionHandler::setExceptionInput(QUmlObjectNode *exceptionInput) { // This is a read-write association end - QM_D(QUmlExceptionHandler); - if (d->exceptionInput != exceptionInput) { - d->exceptionInput = exceptionInput; + if (_exceptionInput != exceptionInput) { + _exceptionInput = exceptionInput; } } @@ -99,17 +89,15 @@ QSet<QUmlClassifier *> QUmlExceptionHandler::exceptionType() const { // This is a read-write association end - QM_D(const QUmlExceptionHandler); - return d->exceptionType; + return _exceptionType; } void QUmlExceptionHandler::addExceptionType(QUmlClassifier *exceptionType) { // This is a read-write association end - QM_D(QUmlExceptionHandler); - if (!d->exceptionType.contains(exceptionType)) { - d->exceptionType.insert(exceptionType); + if (!_exceptionType.contains(exceptionType)) { + _exceptionType.insert(exceptionType); } } @@ -117,9 +105,8 @@ void QUmlExceptionHandler::removeExceptionType(QUmlClassifier *exceptionType) { // This is a read-write association end - QM_D(QUmlExceptionHandler); - if (d->exceptionType.contains(exceptionType)) { - d->exceptionType.remove(exceptionType); + if (_exceptionType.contains(exceptionType)) { + _exceptionType.remove(exceptionType); } } @@ -130,17 +117,15 @@ QUmlExecutableNode *QUmlExceptionHandler::handlerBody() const { // This is a read-write association end - QM_D(const QUmlExceptionHandler); - return d->handlerBody; + return _handlerBody; } void QUmlExceptionHandler::setHandlerBody(QUmlExecutableNode *handlerBody) { // This is a read-write association end - QM_D(QUmlExceptionHandler); - if (d->handlerBody != handlerBody) { - d->handlerBody = handlerBody; + if (_handlerBody != handlerBody) { + _handlerBody = handlerBody; } } @@ -151,17 +136,15 @@ QUmlExecutableNode *QUmlExceptionHandler::protectedNode() const { // This is a read-write association end - QM_D(const QUmlExceptionHandler); - return d->protectedNode; + return _protectedNode; } void QUmlExceptionHandler::setProtectedNode(QUmlExecutableNode *protectedNode) { // This is a read-write association end - QM_D(QUmlExceptionHandler); - if (d->protectedNode != protectedNode) { - d->protectedNode = protectedNode; + if (_protectedNode != protectedNode) { + _protectedNode = protectedNode; } } diff --git a/src/uml/qumlexceptionhandler.h b/src/uml/qumlexceptionhandler.h index b17ea046..ed886a30 100644 --- a/src/uml/qumlexceptionhandler.h +++ b/src/uml/qumlexceptionhandler.h @@ -55,11 +55,10 @@ class QUmlClassifier; class QUmlExecutableNode; class QUmlObjectNode; -class QUmlExceptionHandlerPrivate; class Q_UML_EXPORT QUmlExceptionHandler : public QUmlElement { public: - QUmlExceptionHandler(bool create_d_ptr = true); + QUmlExceptionHandler(); // Owned attributes QUmlObjectNode *exceptionInput() const; @@ -71,6 +70,12 @@ public: void setHandlerBody(QUmlExecutableNode *handlerBody); QUmlExecutableNode *protectedNode() const; void setProtectedNode(QUmlExecutableNode *protectedNode); + +protected: + QUmlObjectNode *_exceptionInput; + QSet<QUmlClassifier *> _exceptionType; + QUmlExecutableNode *_handlerBody; + QUmlExecutableNode *_protectedNode; }; QT_END_NAMESPACE diff --git a/src/uml/qumlexceptionhandler_p.h b/src/uml/qumlexceptionhandler_p.h deleted file mode 100644 index 908c83a3..00000000 --- a/src/uml/qumlexceptionhandler_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXCEPTIONHANDLER_P_H -#define QUMLEXCEPTIONHANDLER_P_H - -#include "QtUml/QUmlExceptionHandler" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExceptionHandlerPrivate : public QUmlElementPrivate -{ -public: - QUmlExceptionHandlerPrivate(); - - QUmlObjectNode *exceptionInput; - QSet<QUmlClassifier *> exceptionType; - QUmlExecutableNode *handlerBody; - QUmlExecutableNode *protectedNode; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXCEPTIONHANDLER_P_H - diff --git a/src/uml/qumlexecutablenode.cpp b/src/uml/qumlexecutablenode.cpp index 19f20e0c..efaba3af 100644 --- a/src/uml/qumlexecutablenode.cpp +++ b/src/uml/qumlexecutablenode.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlexecutablenode.h" -#include "qumlexecutablenode_p.h" #include <QtUml/QUmlExceptionHandler> QT_BEGIN_NAMESPACE -QUmlExecutableNodePrivate::QUmlExecutableNodePrivate() -{ -} - /*! \class QUmlExecutableNode @@ -57,11 +52,8 @@ QUmlExecutableNodePrivate::QUmlExecutableNodePrivate() \brief An executable node is an abstract class for activity nodes that may be executed. It is used as an attachment point for exception handlers.An executable node is an abstract class for activity nodes that may be executed. It is used as an attachment point for exception handlers. */ -QUmlExecutableNode::QUmlExecutableNode(bool create_d_ptr) : - QUmlActivityNode(false) +QUmlExecutableNode::QUmlExecutableNode() { - if (create_d_ptr) - set_d_ptr(new QUmlExecutableNodePrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QSet<QUmlExceptionHandler *> QUmlExecutableNode::handler() const { // This is a read-write association end - QM_D(const QUmlExecutableNode); - return d->handler; + return _handler; } void QUmlExecutableNode::addHandler(QUmlExceptionHandler *handler) { // This is a read-write association end - QM_D(QUmlExecutableNode); - if (!d->handler.contains(handler)) { - d->handler.insert(handler); + if (!_handler.contains(handler)) { + _handler.insert(handler); } } @@ -91,9 +81,8 @@ void QUmlExecutableNode::removeHandler(QUmlExceptionHandler *handler) { // This is a read-write association end - QM_D(QUmlExecutableNode); - if (d->handler.contains(handler)) { - d->handler.remove(handler); + if (_handler.contains(handler)) { + _handler.remove(handler); } } diff --git a/src/uml/qumlexecutablenode.h b/src/uml/qumlexecutablenode.h index c9cd440c..b127a261 100644 --- a/src/uml/qumlexecutablenode.h +++ b/src/uml/qumlexecutablenode.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlExceptionHandler; -class QUmlExecutableNodePrivate; class Q_UML_EXPORT QUmlExecutableNode : public QUmlActivityNode { public: - Q_DECL_HIDDEN QUmlExecutableNode(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlExecutableNode(); // Owned attributes QSet<QUmlExceptionHandler *> handler() const; void addHandler(QUmlExceptionHandler *handler); void removeHandler(QUmlExceptionHandler *handler); + +protected: + QSet<QUmlExceptionHandler *> _handler; }; QT_END_NAMESPACE diff --git a/src/uml/qumlexecutablenode_p.h b/src/uml/qumlexecutablenode_p.h deleted file mode 100644 index df983b2a..00000000 --- a/src/uml/qumlexecutablenode_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXECUTABLENODE_P_H -#define QUMLEXECUTABLENODE_P_H - -#include "QtUml/QUmlExecutableNode" - -#include "private/qumlactivitynode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExecutableNodePrivate : public QUmlActivityNodePrivate -{ -public: - QUmlExecutableNodePrivate(); - - QSet<QUmlExceptionHandler *> handler; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXECUTABLENODE_P_H - diff --git a/src/uml/qumlexecutionenvironment.cpp b/src/uml/qumlexecutionenvironment.cpp index 9d35e5f7..c9d30e58 100644 --- a/src/uml/qumlexecutionenvironment.cpp +++ b/src/uml/qumlexecutionenvironment.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlexecutionenvironment.h" -#include "qumlexecutionenvironment_p.h" QT_BEGIN_NAMESPACE -QUmlExecutionEnvironmentPrivate::QUmlExecutionEnvironmentPrivate() -{ -} - /*! \class QUmlExecutionEnvironment @@ -55,11 +50,8 @@ QUmlExecutionEnvironmentPrivate::QUmlExecutionEnvironmentPrivate() \brief An execution environment is a node that offers an execution environment for specific types of components that are deployed on it in the form of executable artifacts. */ -QUmlExecutionEnvironment::QUmlExecutionEnvironment(bool create_d_ptr) : - QUmlNode(false) +QUmlExecutionEnvironment::QUmlExecutionEnvironment() { - if (create_d_ptr) - set_d_ptr(new QUmlExecutionEnvironmentPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlexecutionenvironment.h b/src/uml/qumlexecutionenvironment.h index e2695475..c9b92330 100644 --- a/src/uml/qumlexecutionenvironment.h +++ b/src/uml/qumlexecutionenvironment.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlExecutionEnvironmentPrivate; class Q_UML_EXPORT QUmlExecutionEnvironment : public QUmlNode { public: - QUmlExecutionEnvironment(bool create_d_ptr = true); + QUmlExecutionEnvironment(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlexecutionenvironment_p.h b/src/uml/qumlexecutionenvironment_p.h deleted file mode 100644 index 15a1598a..00000000 --- a/src/uml/qumlexecutionenvironment_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXECUTIONENVIRONMENT_P_H -#define QUMLEXECUTIONENVIRONMENT_P_H - -#include "QtUml/QUmlExecutionEnvironment" - -#include "private/qumlnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExecutionEnvironmentPrivate : public QUmlNodePrivate -{ -public: - QUmlExecutionEnvironmentPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXECUTIONENVIRONMENT_P_H - diff --git a/src/uml/qumlexecutionoccurrencespecification.cpp b/src/uml/qumlexecutionoccurrencespecification.cpp index bec34a99..6827fbc5 100644 --- a/src/uml/qumlexecutionoccurrencespecification.cpp +++ b/src/uml/qumlexecutionoccurrencespecification.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlexecutionoccurrencespecification.h" -#include "qumlexecutionoccurrencespecification_p.h" #include <QtUml/QUmlExecutionSpecification> QT_BEGIN_NAMESPACE -QUmlExecutionOccurrenceSpecificationPrivate::QUmlExecutionOccurrenceSpecificationPrivate() : - execution(0) -{ -} - /*! \class QUmlExecutionOccurrenceSpecification @@ -58,11 +52,9 @@ QUmlExecutionOccurrenceSpecificationPrivate::QUmlExecutionOccurrenceSpecificatio \brief An execution occurrence specification represents moments in time at which actions or behaviors start or finish. */ -QUmlExecutionOccurrenceSpecification::QUmlExecutionOccurrenceSpecification(bool create_d_ptr) : - QUmlOccurrenceSpecification(false) +QUmlExecutionOccurrenceSpecification::QUmlExecutionOccurrenceSpecification() : + _execution(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExecutionOccurrenceSpecificationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlExecutionSpecification *QUmlExecutionOccurrenceSpecification::execution() co { // This is a read-write association end - QM_D(const QUmlExecutionOccurrenceSpecification); - return d->execution; + return _execution; } void QUmlExecutionOccurrenceSpecification::setExecution(QUmlExecutionSpecification *execution) { // This is a read-write association end - QM_D(QUmlExecutionOccurrenceSpecification); - if (d->execution != execution) { - d->execution = execution; + if (_execution != execution) { + _execution = execution; } } diff --git a/src/uml/qumlexecutionoccurrencespecification.h b/src/uml/qumlexecutionoccurrencespecification.h index d71e7037..76cc41b0 100644 --- a/src/uml/qumlexecutionoccurrencespecification.h +++ b/src/uml/qumlexecutionoccurrencespecification.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlExecutionSpecification; -class QUmlExecutionOccurrenceSpecificationPrivate; class Q_UML_EXPORT QUmlExecutionOccurrenceSpecification : public QUmlOccurrenceSpecification { public: - QUmlExecutionOccurrenceSpecification(bool create_d_ptr = true); + QUmlExecutionOccurrenceSpecification(); // Owned attributes QUmlExecutionSpecification *execution() const; void setExecution(QUmlExecutionSpecification *execution); + +protected: + QUmlExecutionSpecification *_execution; }; QT_END_NAMESPACE diff --git a/src/uml/qumlexecutionoccurrencespecification_p.h b/src/uml/qumlexecutionoccurrencespecification_p.h deleted file mode 100644 index 2c3e227a..00000000 --- a/src/uml/qumlexecutionoccurrencespecification_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXECUTIONOCCURRENCESPECIFICATION_P_H -#define QUMLEXECUTIONOCCURRENCESPECIFICATION_P_H - -#include "QtUml/QUmlExecutionOccurrenceSpecification" - -#include "private/qumloccurrencespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExecutionOccurrenceSpecificationPrivate : public QUmlOccurrenceSpecificationPrivate -{ -public: - QUmlExecutionOccurrenceSpecificationPrivate(); - - QUmlExecutionSpecification *execution; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXECUTIONOCCURRENCESPECIFICATION_P_H - diff --git a/src/uml/qumlexecutionspecification.cpp b/src/uml/qumlexecutionspecification.cpp index 0b958a94..5fcbe80e 100644 --- a/src/uml/qumlexecutionspecification.cpp +++ b/src/uml/qumlexecutionspecification.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlexecutionspecification.h" -#include "qumlexecutionspecification_p.h" #include <QtUml/QUmlOccurrenceSpecification> QT_BEGIN_NAMESPACE -QUmlExecutionSpecificationPrivate::QUmlExecutionSpecificationPrivate() : - finish(0), - start(0) -{ -} - /*! \class QUmlExecutionSpecification @@ -59,11 +52,10 @@ QUmlExecutionSpecificationPrivate::QUmlExecutionSpecificationPrivate() : \brief An execution specification is a specification of the execution of a unit of behavior or action within the lifeline. The duration of an execution specification is represented by two cccurrence specifications, the start occurrence specification and the finish occurrence specification. */ -QUmlExecutionSpecification::QUmlExecutionSpecification(bool create_d_ptr) : - QUmlInteractionFragment(false) +QUmlExecutionSpecification::QUmlExecutionSpecification() : + _finish(0), + _start(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExecutionSpecificationPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlOccurrenceSpecification *QUmlExecutionSpecification::finish() const { // This is a read-write association end - QM_D(const QUmlExecutionSpecification); - return d->finish; + return _finish; } void QUmlExecutionSpecification::setFinish(QUmlOccurrenceSpecification *finish) { // This is a read-write association end - QM_D(QUmlExecutionSpecification); - if (d->finish != finish) { - d->finish = finish; + if (_finish != finish) { + _finish = finish; } } @@ -96,17 +86,15 @@ QUmlOccurrenceSpecification *QUmlExecutionSpecification::start() const { // This is a read-write association end - QM_D(const QUmlExecutionSpecification); - return d->start; + return _start; } void QUmlExecutionSpecification::setStart(QUmlOccurrenceSpecification *start) { // This is a read-write association end - QM_D(QUmlExecutionSpecification); - if (d->start != start) { - d->start = start; + if (_start != start) { + _start = start; } } diff --git a/src/uml/qumlexecutionspecification.h b/src/uml/qumlexecutionspecification.h index a485928b..0992a445 100644 --- a/src/uml/qumlexecutionspecification.h +++ b/src/uml/qumlexecutionspecification.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlOccurrenceSpecification; -class QUmlExecutionSpecificationPrivate; class Q_UML_EXPORT QUmlExecutionSpecification : public QUmlInteractionFragment { public: - Q_DECL_HIDDEN QUmlExecutionSpecification(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlExecutionSpecification(); // Owned attributes QUmlOccurrenceSpecification *finish() const; void setFinish(QUmlOccurrenceSpecification *finish); QUmlOccurrenceSpecification *start() const; void setStart(QUmlOccurrenceSpecification *start); + +protected: + QUmlOccurrenceSpecification *_finish; + QUmlOccurrenceSpecification *_start; }; QT_END_NAMESPACE diff --git a/src/uml/qumlexecutionspecification_p.h b/src/uml/qumlexecutionspecification_p.h deleted file mode 100644 index 2d4286d1..00000000 --- a/src/uml/qumlexecutionspecification_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXECUTIONSPECIFICATION_P_H -#define QUMLEXECUTIONSPECIFICATION_P_H - -#include "QtUml/QUmlExecutionSpecification" - -#include "private/qumlinteractionfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExecutionSpecificationPrivate : public QUmlInteractionFragmentPrivate -{ -public: - QUmlExecutionSpecificationPrivate(); - - QUmlOccurrenceSpecification *finish; - QUmlOccurrenceSpecification *start; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXECUTIONSPECIFICATION_P_H - diff --git a/src/uml/qumlexpansionnode.cpp b/src/uml/qumlexpansionnode.cpp index 07b80a97..5e3d3b93 100644 --- a/src/uml/qumlexpansionnode.cpp +++ b/src/uml/qumlexpansionnode.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlexpansionnode.h" -#include "qumlexpansionnode_p.h" #include <QtUml/QUmlExpansionRegion> QT_BEGIN_NAMESPACE -QUmlExpansionNodePrivate::QUmlExpansionNodePrivate() : - regionAsInput(0), - regionAsOutput(0) -{ -} - /*! \class QUmlExpansionNode @@ -59,11 +52,10 @@ QUmlExpansionNodePrivate::QUmlExpansionNodePrivate() : \brief An expansion node is an object node used to indicate a flow across the boundary of an expansion region. A flow into a region contains a collection that is broken into its individual elements inside the region, which is executed once per element. A flow out of a region combines individual elements into a collection for use outside the region. */ -QUmlExpansionNode::QUmlExpansionNode(bool create_d_ptr) : - QUmlObjectNode(false) +QUmlExpansionNode::QUmlExpansionNode() : + _regionAsInput(0), + _regionAsOutput(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExpansionNodePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlExpansionRegion *QUmlExpansionNode::regionAsInput() const { // This is a read-write association end - QM_D(const QUmlExpansionNode); - return d->regionAsInput; + return _regionAsInput; } void QUmlExpansionNode::setRegionAsInput(QUmlExpansionRegion *regionAsInput) { // This is a read-write association end - QM_D(QUmlExpansionNode); - if (d->regionAsInput != regionAsInput) { - d->regionAsInput = regionAsInput; + if (_regionAsInput != regionAsInput) { + _regionAsInput = regionAsInput; } } @@ -96,17 +86,15 @@ QUmlExpansionRegion *QUmlExpansionNode::regionAsOutput() const { // This is a read-write association end - QM_D(const QUmlExpansionNode); - return d->regionAsOutput; + return _regionAsOutput; } void QUmlExpansionNode::setRegionAsOutput(QUmlExpansionRegion *regionAsOutput) { // This is a read-write association end - QM_D(QUmlExpansionNode); - if (d->regionAsOutput != regionAsOutput) { - d->regionAsOutput = regionAsOutput; + if (_regionAsOutput != regionAsOutput) { + _regionAsOutput = regionAsOutput; } } diff --git a/src/uml/qumlexpansionnode.h b/src/uml/qumlexpansionnode.h index 73052689..66221abd 100644 --- a/src/uml/qumlexpansionnode.h +++ b/src/uml/qumlexpansionnode.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlExpansionRegion; -class QUmlExpansionNodePrivate; class Q_UML_EXPORT QUmlExpansionNode : public QUmlObjectNode { public: - QUmlExpansionNode(bool create_d_ptr = true); + QUmlExpansionNode(); // Owned attributes QUmlExpansionRegion *regionAsInput() const; void setRegionAsInput(QUmlExpansionRegion *regionAsInput); QUmlExpansionRegion *regionAsOutput() const; void setRegionAsOutput(QUmlExpansionRegion *regionAsOutput); + +protected: + QUmlExpansionRegion *_regionAsInput; + QUmlExpansionRegion *_regionAsOutput; }; QT_END_NAMESPACE diff --git a/src/uml/qumlexpansionnode_p.h b/src/uml/qumlexpansionnode_p.h deleted file mode 100644 index 309cbec6..00000000 --- a/src/uml/qumlexpansionnode_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXPANSIONNODE_P_H -#define QUMLEXPANSIONNODE_P_H - -#include "QtUml/QUmlExpansionNode" - -#include "private/qumlobjectnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExpansionNodePrivate : public QUmlObjectNodePrivate -{ -public: - QUmlExpansionNodePrivate(); - - QUmlExpansionRegion *regionAsInput; - QUmlExpansionRegion *regionAsOutput; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXPANSIONNODE_P_H - diff --git a/src/uml/qumlexpansionregion.cpp b/src/uml/qumlexpansionregion.cpp index d8444ff5..652eec41 100644 --- a/src/uml/qumlexpansionregion.cpp +++ b/src/uml/qumlexpansionregion.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlexpansionregion.h" -#include "qumlexpansionregion_p.h" #include <QtUml/QUmlExpansionNode> QT_BEGIN_NAMESPACE -QUmlExpansionRegionPrivate::QUmlExpansionRegionPrivate() : - mode(QtUml::ExpansionIterative) -{ -} - /*! \class QUmlExpansionRegion @@ -58,11 +52,9 @@ QUmlExpansionRegionPrivate::QUmlExpansionRegionPrivate() : \brief An expansion region is a structured activity region that executes multiple times corresponding to elements of an input collection. */ -QUmlExpansionRegion::QUmlExpansionRegion(bool create_d_ptr) : - QUmlStructuredActivityNode(false) +QUmlExpansionRegion::QUmlExpansionRegion() : + _mode(QtUml::ExpansionIterative) { - if (create_d_ptr) - set_d_ptr(new QUmlExpansionRegionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QSet<QUmlExpansionNode *> QUmlExpansionRegion::inputElement() const { // This is a read-write association end - QM_D(const QUmlExpansionRegion); - return d->inputElement; + return _inputElement; } void QUmlExpansionRegion::addInputElement(QUmlExpansionNode *inputElement) { // This is a read-write association end - QM_D(QUmlExpansionRegion); - if (!d->inputElement.contains(inputElement)) { - d->inputElement.insert(inputElement); + if (!_inputElement.contains(inputElement)) { + _inputElement.insert(inputElement); } } @@ -92,9 +82,8 @@ void QUmlExpansionRegion::removeInputElement(QUmlExpansionNode *inputElement) { // This is a read-write association end - QM_D(QUmlExpansionRegion); - if (d->inputElement.contains(inputElement)) { - d->inputElement.remove(inputElement); + if (_inputElement.contains(inputElement)) { + _inputElement.remove(inputElement); } } @@ -105,17 +94,15 @@ QtUml::ExpansionKind QUmlExpansionRegion::mode() const { // This is a read-write property - QM_D(const QUmlExpansionRegion); - return d->mode; + return _mode; } void QUmlExpansionRegion::setMode(QtUml::ExpansionKind mode) { // This is a read-write property - QM_D(QUmlExpansionRegion); - if (d->mode != mode) { - d->mode = mode; + if (_mode != mode) { + _mode = mode; } } @@ -126,17 +113,15 @@ QSet<QUmlExpansionNode *> QUmlExpansionRegion::outputElement() const { // This is a read-write association end - QM_D(const QUmlExpansionRegion); - return d->outputElement; + return _outputElement; } void QUmlExpansionRegion::addOutputElement(QUmlExpansionNode *outputElement) { // This is a read-write association end - QM_D(QUmlExpansionRegion); - if (!d->outputElement.contains(outputElement)) { - d->outputElement.insert(outputElement); + if (!_outputElement.contains(outputElement)) { + _outputElement.insert(outputElement); } } @@ -144,9 +129,8 @@ void QUmlExpansionRegion::removeOutputElement(QUmlExpansionNode *outputElement) { // This is a read-write association end - QM_D(QUmlExpansionRegion); - if (d->outputElement.contains(outputElement)) { - d->outputElement.remove(outputElement); + if (_outputElement.contains(outputElement)) { + _outputElement.remove(outputElement); } } diff --git a/src/uml/qumlexpansionregion.h b/src/uml/qumlexpansionregion.h index 05c64000..998a47b2 100644 --- a/src/uml/qumlexpansionregion.h +++ b/src/uml/qumlexpansionregion.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlExpansionNode; -class QUmlExpansionRegionPrivate; class Q_UML_EXPORT QUmlExpansionRegion : public QUmlStructuredActivityNode { public: - QUmlExpansionRegion(bool create_d_ptr = true); + QUmlExpansionRegion(); // Owned attributes QSet<QUmlExpansionNode *> inputElement() const; @@ -69,6 +68,11 @@ public: QSet<QUmlExpansionNode *> outputElement() const; void addOutputElement(QUmlExpansionNode *outputElement); void removeOutputElement(QUmlExpansionNode *outputElement); + +protected: + QSet<QUmlExpansionNode *> _inputElement; + QtUml::ExpansionKind _mode; + QSet<QUmlExpansionNode *> _outputElement; }; QT_END_NAMESPACE diff --git a/src/uml/qumlexpansionregion_p.h b/src/uml/qumlexpansionregion_p.h deleted file mode 100644 index a6e1f114..00000000 --- a/src/uml/qumlexpansionregion_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXPANSIONREGION_P_H -#define QUMLEXPANSIONREGION_P_H - -#include "QtUml/QUmlExpansionRegion" - -#include "private/qumlstructuredactivitynode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExpansionRegionPrivate : public QUmlStructuredActivityNodePrivate -{ -public: - QUmlExpansionRegionPrivate(); - - QSet<QUmlExpansionNode *> inputElement; - QtUml::ExpansionKind mode; - QSet<QUmlExpansionNode *> outputElement; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXPANSIONREGION_P_H - diff --git a/src/uml/qumlexpression.cpp b/src/uml/qumlexpression.cpp index 87b73c3d..22e903a8 100644 --- a/src/uml/qumlexpression.cpp +++ b/src/uml/qumlexpression.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlexpression.h" -#include "qumlexpression_p.h" QT_BEGIN_NAMESPACE -QUmlExpressionPrivate::QUmlExpressionPrivate() -{ -} - /*! \class QUmlExpression @@ -55,11 +50,8 @@ QUmlExpressionPrivate::QUmlExpressionPrivate() \brief An expression is a structured tree of symbols that denotes a (possibly empty) set of values when evaluated in a context.An expression represents a node in an expression tree, which may be non-terminal or terminal. It defines a symbol, and has a possibly empty sequence of operands which are value specifications. */ -QUmlExpression::QUmlExpression(bool create_d_ptr) : - QUmlValueSpecification(false) +QUmlExpression::QUmlExpression() { - if (create_d_ptr) - set_d_ptr(new QUmlExpressionPrivate); } // OWNED ATTRIBUTES @@ -71,17 +63,15 @@ QList<QUmlValueSpecification *> QUmlExpression::operand() const { // This is a read-write association end - QM_D(const QUmlExpression); - return d->operand; + return _operand; } void QUmlExpression::addOperand(QUmlValueSpecification *operand) { // This is a read-write association end - QM_D(QUmlExpression); - if (!d->operand.contains(operand)) { - d->operand.append(operand); + if (!_operand.contains(operand)) { + _operand.append(operand); } } @@ -89,9 +79,8 @@ void QUmlExpression::removeOperand(QUmlValueSpecification *operand) { // This is a read-write association end - QM_D(QUmlExpression); - if (d->operand.contains(operand)) { - d->operand.removeAll(operand); + if (_operand.contains(operand)) { + _operand.removeAll(operand); } } @@ -102,17 +91,15 @@ QString QUmlExpression::symbol() const { // This is a read-write property - QM_D(const QUmlExpression); - return d->symbol; + return _symbol; } void QUmlExpression::setSymbol(QString symbol) { // This is a read-write property - QM_D(QUmlExpression); - if (d->symbol != symbol) { - d->symbol = symbol; + if (_symbol != symbol) { + _symbol = symbol; } } diff --git a/src/uml/qumlexpression.h b/src/uml/qumlexpression.h index 2ad319e9..a84bdc87 100644 --- a/src/uml/qumlexpression.h +++ b/src/uml/qumlexpression.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlExpressionPrivate; class Q_UML_EXPORT QUmlExpression : public QUmlValueSpecification { public: - QUmlExpression(bool create_d_ptr = true); + QUmlExpression(); // Owned attributes QList<QUmlValueSpecification *> operand() const; @@ -63,6 +62,10 @@ public: void removeOperand(QUmlValueSpecification *operand); QString symbol() const; void setSymbol(QString symbol); + +protected: + QList<QUmlValueSpecification *> _operand; + QString _symbol; }; QT_END_NAMESPACE diff --git a/src/uml/qumlexpression_p.h b/src/uml/qumlexpression_p.h deleted file mode 100644 index f71088a9..00000000 --- a/src/uml/qumlexpression_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXPRESSION_P_H -#define QUMLEXPRESSION_P_H - -#include "QtUml/QUmlExpression" - -#include "private/qumlvaluespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExpressionPrivate : public QUmlValueSpecificationPrivate -{ -public: - QUmlExpressionPrivate(); - - QList<QUmlValueSpecification *> operand; - QString symbol; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXPRESSION_P_H - diff --git a/src/uml/qumlextend.cpp b/src/uml/qumlextend.cpp index 7da23aa6..04d2f97f 100644 --- a/src/uml/qumlextend.cpp +++ b/src/uml/qumlextend.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlextend.h" -#include "qumlextend_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlExtensionPoint> @@ -47,13 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlExtendPrivate::QUmlExtendPrivate() : - condition(0), - extendedCase(0), - extension(0) -{ -} - /*! \class QUmlExtend @@ -62,12 +54,11 @@ QUmlExtendPrivate::QUmlExtendPrivate() : \brief A relationship from an extending use case to an extended use case that specifies how and when the behavior defined in the extending use case can be inserted into the behavior defined in the extended use case. */ -QUmlExtend::QUmlExtend(bool create_d_ptr) : - QUmlDirectedRelationship(false), - QUmlNamedElement(false) +QUmlExtend::QUmlExtend() : + _condition(0), + _extendedCase(0), + _extension(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExtendPrivate); } // OWNED ATTRIBUTES @@ -79,17 +70,15 @@ QUmlConstraint *QUmlExtend::condition() const { // This is a read-write association end - QM_D(const QUmlExtend); - return d->condition; + return _condition; } void QUmlExtend::setCondition(QUmlConstraint *condition) { // This is a read-write association end - QM_D(QUmlExtend); - if (d->condition != condition) { - d->condition = condition; + if (_condition != condition) { + _condition = condition; } } @@ -100,17 +89,15 @@ QUmlUseCase *QUmlExtend::extendedCase() const { // This is a read-write association end - QM_D(const QUmlExtend); - return d->extendedCase; + return _extendedCase; } void QUmlExtend::setExtendedCase(QUmlUseCase *extendedCase) { // This is a read-write association end - QM_D(QUmlExtend); - if (d->extendedCase != extendedCase) { - d->extendedCase = extendedCase; + if (_extendedCase != extendedCase) { + _extendedCase = extendedCase; } } @@ -121,17 +108,15 @@ QUmlUseCase *QUmlExtend::extension() const { // This is a read-write association end - QM_D(const QUmlExtend); - return d->extension; + return _extension; } void QUmlExtend::setExtension(QUmlUseCase *extension) { // This is a read-write association end - QM_D(QUmlExtend); - if (d->extension != extension) { - d->extension = extension; + if (_extension != extension) { + _extension = extension; } } @@ -142,17 +127,15 @@ QList<QUmlExtensionPoint *> QUmlExtend::extensionLocation() const { // This is a read-write association end - QM_D(const QUmlExtend); - return d->extensionLocation; + return _extensionLocation; } void QUmlExtend::addExtensionLocation(QUmlExtensionPoint *extensionLocation) { // This is a read-write association end - QM_D(QUmlExtend); - if (!d->extensionLocation.contains(extensionLocation)) { - d->extensionLocation.append(extensionLocation); + if (!_extensionLocation.contains(extensionLocation)) { + _extensionLocation.append(extensionLocation); } } @@ -160,9 +143,8 @@ void QUmlExtend::removeExtensionLocation(QUmlExtensionPoint *extensionLocation) { // This is a read-write association end - QM_D(QUmlExtend); - if (d->extensionLocation.contains(extensionLocation)) { - d->extensionLocation.removeAll(extensionLocation); + if (_extensionLocation.contains(extensionLocation)) { + _extensionLocation.removeAll(extensionLocation); } } diff --git a/src/uml/qumlextend.h b/src/uml/qumlextend.h index 2297bf18..b227ca45 100644 --- a/src/uml/qumlextend.h +++ b/src/uml/qumlextend.h @@ -56,11 +56,10 @@ class QUmlConstraint; class QUmlExtensionPoint; class QUmlUseCase; -class QUmlExtendPrivate; class Q_UML_EXPORT QUmlExtend : public QUmlDirectedRelationship, public QUmlNamedElement { public: - QUmlExtend(bool create_d_ptr = true); + QUmlExtend(); // Owned attributes QUmlConstraint *condition() const; @@ -72,6 +71,12 @@ public: QList<QUmlExtensionPoint *> extensionLocation() const; void addExtensionLocation(QUmlExtensionPoint *extensionLocation); void removeExtensionLocation(QUmlExtensionPoint *extensionLocation); + +protected: + QUmlConstraint *_condition; + QUmlUseCase *_extendedCase; + QUmlUseCase *_extension; + QList<QUmlExtensionPoint *> _extensionLocation; }; QT_END_NAMESPACE diff --git a/src/uml/qumlextend_p.h b/src/uml/qumlextend_p.h deleted file mode 100644 index d86e1e8c..00000000 --- a/src/uml/qumlextend_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXTEND_P_H -#define QUMLEXTEND_P_H - -#include "QtUml/QUmlExtend" - -#include "private/qumldirectedrelationship_p.h" -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExtendPrivate : public QUmlDirectedRelationshipPrivate, public QUmlNamedElementPrivate -{ -public: - QUmlExtendPrivate(); - - QUmlConstraint *condition; - QUmlUseCase *extendedCase; - QUmlUseCase *extension; - QList<QUmlExtensionPoint *> extensionLocation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXTEND_P_H - diff --git a/src/uml/qumlextension.cpp b/src/uml/qumlextension.cpp index 5c34c09c..0a9d8006 100644 --- a/src/uml/qumlextension.cpp +++ b/src/uml/qumlextension.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlextension.h" -#include "qumlextension_p.h" #include <QtUml/QUmlClass> #include <QtUml/QUmlExtensionEnd> @@ -47,11 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlExtensionPrivate::QUmlExtensionPrivate() : - ownedEnd(0) -{ -} - /*! \class QUmlExtension @@ -60,11 +54,9 @@ QUmlExtensionPrivate::QUmlExtensionPrivate() : \brief An extension is used to indicate that the properties of a metaclass are extended through a stereotype, and gives the ability to flexibly add (and later remove) stereotypes to classes. */ -QUmlExtension::QUmlExtension(bool create_d_ptr) : - QUmlAssociation(false) +QUmlExtension::QUmlExtension() : + _ownedEnd(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExtensionPrivate); } // OWNED ATTRIBUTES @@ -100,17 +92,15 @@ QUmlExtensionEnd *QUmlExtension::ownedEnd() const { // This is a read-write association end - QM_D(const QUmlExtension); - return d->ownedEnd; + return _ownedEnd; } void QUmlExtension::setOwnedEnd(QUmlExtensionEnd *ownedEnd) { // This is a read-write association end - QM_D(QUmlExtension); - if (d->ownedEnd != ownedEnd) { - d->ownedEnd = ownedEnd; + if (_ownedEnd != ownedEnd) { + _ownedEnd = ownedEnd; } } diff --git a/src/uml/qumlextension.h b/src/uml/qumlextension.h index a0f8ecde..14cb8660 100644 --- a/src/uml/qumlextension.h +++ b/src/uml/qumlextension.h @@ -55,11 +55,10 @@ class QUmlClass; class QUmlExtensionEnd; class QUmlProperty; -class QUmlExtensionPrivate; class Q_UML_EXPORT QUmlExtension : public QUmlAssociation { public: - QUmlExtension(bool create_d_ptr = true); + QUmlExtension(); // Owned attributes bool isRequired() const; @@ -69,6 +68,9 @@ public: // Operations QUmlProperty *metaclassEnd() const; + +protected: + QUmlExtensionEnd *_ownedEnd; }; QT_END_NAMESPACE diff --git a/src/uml/qumlextension_p.h b/src/uml/qumlextension_p.h deleted file mode 100644 index 950a6e5c..00000000 --- a/src/uml/qumlextension_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXTENSION_P_H -#define QUMLEXTENSION_P_H - -#include "QtUml/QUmlExtension" - -#include "private/qumlassociation_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExtensionPrivate : public QUmlAssociationPrivate -{ -public: - QUmlExtensionPrivate(); - - QUmlExtensionEnd *ownedEnd; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXTENSION_P_H - diff --git a/src/uml/qumlextensionend.cpp b/src/uml/qumlextensionend.cpp index 80fdc9e2..c7547fcc 100644 --- a/src/uml/qumlextensionend.cpp +++ b/src/uml/qumlextensionend.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlextensionend.h" -#include "qumlextensionend_p.h" #include <QtUml/QUmlStereotype> QT_BEGIN_NAMESPACE -QUmlExtensionEndPrivate::QUmlExtensionEndPrivate() : - type(0) -{ -} - /*! \class QUmlExtensionEnd @@ -58,11 +52,9 @@ QUmlExtensionEndPrivate::QUmlExtensionEndPrivate() : \brief An extension end is used to tie an extension to a stereotype when extending a metaclass.The default multiplicity of an extension end is 0..1. */ -QUmlExtensionEnd::QUmlExtensionEnd(bool create_d_ptr) : - QUmlProperty(false) +QUmlExtensionEnd::QUmlExtensionEnd() : + _type(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExtensionEndPrivate); } // OWNED ATTRIBUTES @@ -98,17 +90,15 @@ QUmlStereotype *QUmlExtensionEnd::type() const { // This is a read-write association end - QM_D(const QUmlExtensionEnd); - return d->type; + return _type; } void QUmlExtensionEnd::setType(QUmlStereotype *type) { // This is a read-write association end - QM_D(QUmlExtensionEnd); - if (d->type != type) { - d->type = type; + if (_type != type) { + _type = type; } } diff --git a/src/uml/qumlextensionend.h b/src/uml/qumlextensionend.h index d7589c01..cb7ccc65 100644 --- a/src/uml/qumlextensionend.h +++ b/src/uml/qumlextensionend.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlStereotype; -class QUmlExtensionEndPrivate; class Q_UML_EXPORT QUmlExtensionEnd : public QUmlProperty { public: - QUmlExtensionEnd(bool create_d_ptr = true); + QUmlExtensionEnd(); // Owned attributes int lower() const; @@ -67,6 +66,9 @@ public: // Operations int lowerBound() const; + +protected: + QUmlStereotype *_type; }; QT_END_NAMESPACE diff --git a/src/uml/qumlextensionend_p.h b/src/uml/qumlextensionend_p.h deleted file mode 100644 index 2274fa85..00000000 --- a/src/uml/qumlextensionend_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXTENSIONEND_P_H -#define QUMLEXTENSIONEND_P_H - -#include "QtUml/QUmlExtensionEnd" - -#include "private/qumlproperty_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExtensionEndPrivate : public QUmlPropertyPrivate -{ -public: - QUmlExtensionEndPrivate(); - - QUmlStereotype *type; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXTENSIONEND_P_H - diff --git a/src/uml/qumlextensionpoint.cpp b/src/uml/qumlextensionpoint.cpp index b11409ae..54a172e0 100644 --- a/src/uml/qumlextensionpoint.cpp +++ b/src/uml/qumlextensionpoint.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlextensionpoint.h" -#include "qumlextensionpoint_p.h" #include <QtUml/QUmlUseCase> QT_BEGIN_NAMESPACE -QUmlExtensionPointPrivate::QUmlExtensionPointPrivate() : - useCase(0) -{ -} - /*! \class QUmlExtensionPoint @@ -58,11 +52,9 @@ QUmlExtensionPointPrivate::QUmlExtensionPointPrivate() : \brief An extension point identifies a point in the behavior of a use case where that behavior can be extended by the behavior of some other (extending) use case, as specified by an extend relationship. */ -QUmlExtensionPoint::QUmlExtensionPoint(bool create_d_ptr) : - QUmlRedefinableElement(false) +QUmlExtensionPoint::QUmlExtensionPoint() : + _useCase(0) { - if (create_d_ptr) - set_d_ptr(new QUmlExtensionPointPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlUseCase *QUmlExtensionPoint::useCase() const { // This is a read-write association end - QM_D(const QUmlExtensionPoint); - return d->useCase; + return _useCase; } void QUmlExtensionPoint::setUseCase(QUmlUseCase *useCase) { // This is a read-write association end - QM_D(QUmlExtensionPoint); - if (d->useCase != useCase) { - d->useCase = useCase; + if (_useCase != useCase) { + _useCase = useCase; } } diff --git a/src/uml/qumlextensionpoint.h b/src/uml/qumlextensionpoint.h index 22927e30..7ec826ab 100644 --- a/src/uml/qumlextensionpoint.h +++ b/src/uml/qumlextensionpoint.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlUseCase; -class QUmlExtensionPointPrivate; class Q_UML_EXPORT QUmlExtensionPoint : public QUmlRedefinableElement { public: - QUmlExtensionPoint(bool create_d_ptr = true); + QUmlExtensionPoint(); // Owned attributes QUmlUseCase *useCase() const; void setUseCase(QUmlUseCase *useCase); + +protected: + QUmlUseCase *_useCase; }; QT_END_NAMESPACE diff --git a/src/uml/qumlextensionpoint_p.h b/src/uml/qumlextensionpoint_p.h deleted file mode 100644 index 38d53bf7..00000000 --- a/src/uml/qumlextensionpoint_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLEXTENSIONPOINT_P_H -#define QUMLEXTENSIONPOINT_P_H - -#include "QtUml/QUmlExtensionPoint" - -#include "private/qumlredefinableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlExtensionPointPrivate : public QUmlRedefinableElementPrivate -{ -public: - QUmlExtensionPointPrivate(); - - QUmlUseCase *useCase; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLEXTENSIONPOINT_P_H - diff --git a/src/uml/qumlfeature.cpp b/src/uml/qumlfeature.cpp index 2d131cff..4e9fdb42 100644 --- a/src/uml/qumlfeature.cpp +++ b/src/uml/qumlfeature.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlfeature.h" -#include "qumlfeature_p.h" #include <QtUml/QUmlClassifier> QT_BEGIN_NAMESPACE -QUmlFeaturePrivate::QUmlFeaturePrivate() : - isStatic(false) -{ -} - /*! \class QUmlFeature @@ -58,11 +52,9 @@ QUmlFeaturePrivate::QUmlFeaturePrivate() : \brief A feature declares a behavioral or structural characteristic of instances of classifiers. */ -QUmlFeature::QUmlFeature(bool create_d_ptr) : - QUmlRedefinableElement(false) +QUmlFeature::QUmlFeature() : + _isStatic(false) { - if (create_d_ptr) - set_d_ptr(new QUmlFeaturePrivate); } // OWNED ATTRIBUTES @@ -74,8 +66,7 @@ QSet<QUmlClassifier *> QUmlFeature::featuringClassifier() const { // This is a read-only derived union association end - QM_D(const QUmlFeature); - return d->featuringClassifier; + return _featuringClassifier; } /*! @@ -85,17 +76,15 @@ bool QUmlFeature::isStatic() const { // This is a read-write property - QM_D(const QUmlFeature); - return d->isStatic; + return _isStatic; } void QUmlFeature::setStatic(bool isStatic) { // This is a read-write property - QM_D(QUmlFeature); - if (d->isStatic != isStatic) { - d->isStatic = isStatic; + if (_isStatic != isStatic) { + _isStatic = isStatic; } } diff --git a/src/uml/qumlfeature.h b/src/uml/qumlfeature.h index ce9ca842..d09d2fa8 100644 --- a/src/uml/qumlfeature.h +++ b/src/uml/qumlfeature.h @@ -53,16 +53,19 @@ QT_MODULE(QtUml) class QUmlClassifier; -class QUmlFeaturePrivate; class Q_UML_EXPORT QUmlFeature : public QUmlRedefinableElement { public: - Q_DECL_HIDDEN QUmlFeature(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlFeature(); // Owned attributes QSet<QUmlClassifier *> featuringClassifier() const; bool isStatic() const; void setStatic(bool isStatic); + +protected: + QSet<QUmlClassifier *> _featuringClassifier; + bool _isStatic; }; QT_END_NAMESPACE diff --git a/src/uml/qumlfeature_p.h b/src/uml/qumlfeature_p.h deleted file mode 100644 index ef037625..00000000 --- a/src/uml/qumlfeature_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLFEATURE_P_H -#define QUMLFEATURE_P_H - -#include "QtUml/QUmlFeature" - -#include "private/qumlredefinableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlFeaturePrivate : public QUmlRedefinableElementPrivate -{ -public: - QUmlFeaturePrivate(); - - QSet<QUmlClassifier *> featuringClassifier; - bool isStatic; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLFEATURE_P_H - diff --git a/src/uml/qumlfinalnode.cpp b/src/uml/qumlfinalnode.cpp index 41a14247..8fa03017 100644 --- a/src/uml/qumlfinalnode.cpp +++ b/src/uml/qumlfinalnode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlfinalnode.h" -#include "qumlfinalnode_p.h" QT_BEGIN_NAMESPACE -QUmlFinalNodePrivate::QUmlFinalNodePrivate() -{ -} - /*! \class QUmlFinalNode @@ -55,11 +50,8 @@ QUmlFinalNodePrivate::QUmlFinalNodePrivate() \brief A final node is an abstract control node at which a flow in an activity stops. */ -QUmlFinalNode::QUmlFinalNode(bool create_d_ptr) : - QUmlControlNode(false) +QUmlFinalNode::QUmlFinalNode() { - if (create_d_ptr) - set_d_ptr(new QUmlFinalNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlfinalnode.h b/src/uml/qumlfinalnode.h index 762cba32..badb9c76 100644 --- a/src/uml/qumlfinalnode.h +++ b/src/uml/qumlfinalnode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlFinalNodePrivate; class Q_UML_EXPORT QUmlFinalNode : public QUmlControlNode { public: - Q_DECL_HIDDEN QUmlFinalNode(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlFinalNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlfinalnode_p.h b/src/uml/qumlfinalnode_p.h deleted file mode 100644 index 3137b457..00000000 --- a/src/uml/qumlfinalnode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLFINALNODE_P_H -#define QUMLFINALNODE_P_H - -#include "QtUml/QUmlFinalNode" - -#include "private/qumlcontrolnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlFinalNodePrivate : public QUmlControlNodePrivate -{ -public: - QUmlFinalNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLFINALNODE_P_H - diff --git a/src/uml/qumlfinalstate.cpp b/src/uml/qumlfinalstate.cpp index 9093b73a..44899f8c 100644 --- a/src/uml/qumlfinalstate.cpp +++ b/src/uml/qumlfinalstate.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlfinalstate.h" -#include "qumlfinalstate_p.h" QT_BEGIN_NAMESPACE -QUmlFinalStatePrivate::QUmlFinalStatePrivate() -{ -} - /*! \class QUmlFinalState @@ -55,11 +50,8 @@ QUmlFinalStatePrivate::QUmlFinalStatePrivate() \brief A special kind of state signifying that the enclosing region is completed. If the enclosing region is directly contained in a state machine and all other regions in the state machine also are completed, then it means that the entire state machine is completed. */ -QUmlFinalState::QUmlFinalState(bool create_d_ptr) : - QUmlState(false) +QUmlFinalState::QUmlFinalState() { - if (create_d_ptr) - set_d_ptr(new QUmlFinalStatePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlfinalstate.h b/src/uml/qumlfinalstate.h index b7aa81bc..76ac6c2a 100644 --- a/src/uml/qumlfinalstate.h +++ b/src/uml/qumlfinalstate.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlFinalStatePrivate; class Q_UML_EXPORT QUmlFinalState : public QUmlState { public: - QUmlFinalState(bool create_d_ptr = true); + QUmlFinalState(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlfinalstate_p.h b/src/uml/qumlfinalstate_p.h deleted file mode 100644 index 8e0a4568..00000000 --- a/src/uml/qumlfinalstate_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLFINALSTATE_P_H -#define QUMLFINALSTATE_P_H - -#include "QtUml/QUmlFinalState" - -#include "private/qumlstate_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlFinalStatePrivate : public QUmlStatePrivate -{ -public: - QUmlFinalStatePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLFINALSTATE_P_H - diff --git a/src/uml/qumlflowfinalnode.cpp b/src/uml/qumlflowfinalnode.cpp index d9d69052..2a4ddb7d 100644 --- a/src/uml/qumlflowfinalnode.cpp +++ b/src/uml/qumlflowfinalnode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlflowfinalnode.h" -#include "qumlflowfinalnode_p.h" QT_BEGIN_NAMESPACE -QUmlFlowFinalNodePrivate::QUmlFlowFinalNodePrivate() -{ -} - /*! \class QUmlFlowFinalNode @@ -55,11 +50,8 @@ QUmlFlowFinalNodePrivate::QUmlFlowFinalNodePrivate() \brief A flow final node is a final node that terminates a flow. */ -QUmlFlowFinalNode::QUmlFlowFinalNode(bool create_d_ptr) : - QUmlFinalNode(false) +QUmlFlowFinalNode::QUmlFlowFinalNode() { - if (create_d_ptr) - set_d_ptr(new QUmlFlowFinalNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlflowfinalnode.h b/src/uml/qumlflowfinalnode.h index 40629266..fe5f91a7 100644 --- a/src/uml/qumlflowfinalnode.h +++ b/src/uml/qumlflowfinalnode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlFlowFinalNodePrivate; class Q_UML_EXPORT QUmlFlowFinalNode : public QUmlFinalNode { public: - QUmlFlowFinalNode(bool create_d_ptr = true); + QUmlFlowFinalNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlflowfinalnode_p.h b/src/uml/qumlflowfinalnode_p.h deleted file mode 100644 index ea4deafc..00000000 --- a/src/uml/qumlflowfinalnode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLFLOWFINALNODE_P_H -#define QUMLFLOWFINALNODE_P_H - -#include "QtUml/QUmlFlowFinalNode" - -#include "private/qumlfinalnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlFlowFinalNodePrivate : public QUmlFinalNodePrivate -{ -public: - QUmlFlowFinalNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLFLOWFINALNODE_P_H - diff --git a/src/uml/qumlforknode.cpp b/src/uml/qumlforknode.cpp index 010357e6..38d68aa6 100644 --- a/src/uml/qumlforknode.cpp +++ b/src/uml/qumlforknode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlforknode.h" -#include "qumlforknode_p.h" QT_BEGIN_NAMESPACE -QUmlForkNodePrivate::QUmlForkNodePrivate() -{ -} - /*! \class QUmlForkNode @@ -55,11 +50,8 @@ QUmlForkNodePrivate::QUmlForkNodePrivate() \brief A fork node is a control node that splits a flow into multiple concurrent flows. */ -QUmlForkNode::QUmlForkNode(bool create_d_ptr) : - QUmlControlNode(false) +QUmlForkNode::QUmlForkNode() { - if (create_d_ptr) - set_d_ptr(new QUmlForkNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlforknode.h b/src/uml/qumlforknode.h index 3068eb10..1c6c78e8 100644 --- a/src/uml/qumlforknode.h +++ b/src/uml/qumlforknode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlForkNodePrivate; class Q_UML_EXPORT QUmlForkNode : public QUmlControlNode { public: - QUmlForkNode(bool create_d_ptr = true); + QUmlForkNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlforknode_p.h b/src/uml/qumlforknode_p.h deleted file mode 100644 index a5813a40..00000000 --- a/src/uml/qumlforknode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLFORKNODE_P_H -#define QUMLFORKNODE_P_H - -#include "QtUml/QUmlForkNode" - -#include "private/qumlcontrolnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlForkNodePrivate : public QUmlControlNodePrivate -{ -public: - QUmlForkNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLFORKNODE_P_H - diff --git a/src/uml/qumlfunctionbehavior.cpp b/src/uml/qumlfunctionbehavior.cpp index f1dd894b..a31ba62d 100644 --- a/src/uml/qumlfunctionbehavior.cpp +++ b/src/uml/qumlfunctionbehavior.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlfunctionbehavior.h" -#include "qumlfunctionbehavior_p.h" QT_BEGIN_NAMESPACE -QUmlFunctionBehaviorPrivate::QUmlFunctionBehaviorPrivate() -{ -} - /*! \class QUmlFunctionBehavior @@ -55,11 +50,8 @@ QUmlFunctionBehaviorPrivate::QUmlFunctionBehaviorPrivate() \brief A function behavior is an opaque behavior that does not access or modify any objects or other external data. */ -QUmlFunctionBehavior::QUmlFunctionBehavior(bool create_d_ptr) : - QUmlOpaqueBehavior(false) +QUmlFunctionBehavior::QUmlFunctionBehavior() { - if (create_d_ptr) - set_d_ptr(new QUmlFunctionBehaviorPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlfunctionbehavior.h b/src/uml/qumlfunctionbehavior.h index fc23def7..0d3d567c 100644 --- a/src/uml/qumlfunctionbehavior.h +++ b/src/uml/qumlfunctionbehavior.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlFunctionBehaviorPrivate; class Q_UML_EXPORT QUmlFunctionBehavior : public QUmlOpaqueBehavior { public: - QUmlFunctionBehavior(bool create_d_ptr = true); + QUmlFunctionBehavior(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlfunctionbehavior_p.h b/src/uml/qumlfunctionbehavior_p.h deleted file mode 100644 index 6bc3e6bf..00000000 --- a/src/uml/qumlfunctionbehavior_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLFUNCTIONBEHAVIOR_P_H -#define QUMLFUNCTIONBEHAVIOR_P_H - -#include "QtUml/QUmlFunctionBehavior" - -#include "private/qumlopaquebehavior_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlFunctionBehaviorPrivate : public QUmlOpaqueBehaviorPrivate -{ -public: - QUmlFunctionBehaviorPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLFUNCTIONBEHAVIOR_P_H - diff --git a/src/uml/qumlgate.cpp b/src/uml/qumlgate.cpp index e67a88ea..44d0a92b 100644 --- a/src/uml/qumlgate.cpp +++ b/src/uml/qumlgate.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlgate.h" -#include "qumlgate_p.h" QT_BEGIN_NAMESPACE -QUmlGatePrivate::QUmlGatePrivate() -{ -} - /*! \class QUmlGate @@ -55,11 +50,8 @@ QUmlGatePrivate::QUmlGatePrivate() \brief A gate is a connection point for relating a message outside an interaction fragment with a message inside the interaction fragment. */ -QUmlGate::QUmlGate(bool create_d_ptr) : - QUmlMessageEnd(false) +QUmlGate::QUmlGate() { - if (create_d_ptr) - set_d_ptr(new QUmlGatePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlgate.h b/src/uml/qumlgate.h index 6ee88919..26081a0e 100644 --- a/src/uml/qumlgate.h +++ b/src/uml/qumlgate.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlGatePrivate; class Q_UML_EXPORT QUmlGate : public QUmlMessageEnd { public: - QUmlGate(bool create_d_ptr = true); + QUmlGate(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlgate_p.h b/src/uml/qumlgate_p.h deleted file mode 100644 index b5960a45..00000000 --- a/src/uml/qumlgate_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLGATE_P_H -#define QUMLGATE_P_H - -#include "QtUml/QUmlGate" - -#include "private/qumlmessageend_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlGatePrivate : public QUmlMessageEndPrivate -{ -public: - QUmlGatePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLGATE_P_H - diff --git a/src/uml/qumlgeneralization.cpp b/src/uml/qumlgeneralization.cpp index 16d45397..46b9784b 100644 --- a/src/uml/qumlgeneralization.cpp +++ b/src/uml/qumlgeneralization.cpp @@ -39,20 +39,12 @@ ** ****************************************************************************/ #include "qumlgeneralization.h" -#include "qumlgeneralization_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlGeneralizationSet> QT_BEGIN_NAMESPACE -QUmlGeneralizationPrivate::QUmlGeneralizationPrivate() : - general(0), - isSubstitutable(true), - specific(0) -{ -} - /*! \class QUmlGeneralization @@ -61,11 +53,11 @@ QUmlGeneralizationPrivate::QUmlGeneralizationPrivate() : \brief A generalization is a taxonomic relationship between a more general classifier and a more specific classifier. Each instance of the specific classifier is also an indirect instance of the general classifier. Thus, the specific classifier inherits the features of the more general classifier.A generalization relates a specific classifier to a more general classifier, and is owned by the specific classifier. */ -QUmlGeneralization::QUmlGeneralization(bool create_d_ptr) : - QUmlDirectedRelationship(false) +QUmlGeneralization::QUmlGeneralization() : + _general(0), + _isSubstitutable(true), + _specific(0) { - if (create_d_ptr) - set_d_ptr(new QUmlGeneralizationPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlClassifier *QUmlGeneralization::general() const { // This is a read-write association end - QM_D(const QUmlGeneralization); - return d->general; + return _general; } void QUmlGeneralization::setGeneral(QUmlClassifier *general) { // This is a read-write association end - QM_D(QUmlGeneralization); - if (d->general != general) { - d->general = general; + if (_general != general) { + _general = general; } } @@ -98,17 +88,15 @@ QSet<QUmlGeneralizationSet *> QUmlGeneralization::generalizationSet() const { // This is a read-write association end - QM_D(const QUmlGeneralization); - return d->generalizationSet; + return _generalizationSet; } void QUmlGeneralization::addGeneralizationSet(QUmlGeneralizationSet *generalizationSet) { // This is a read-write association end - QM_D(QUmlGeneralization); - if (!d->generalizationSet.contains(generalizationSet)) { - d->generalizationSet.insert(generalizationSet); + if (!_generalizationSet.contains(generalizationSet)) { + _generalizationSet.insert(generalizationSet); } } @@ -116,9 +104,8 @@ void QUmlGeneralization::removeGeneralizationSet(QUmlGeneralizationSet *generali { // This is a read-write association end - QM_D(QUmlGeneralization); - if (d->generalizationSet.contains(generalizationSet)) { - d->generalizationSet.remove(generalizationSet); + if (_generalizationSet.contains(generalizationSet)) { + _generalizationSet.remove(generalizationSet); } } @@ -129,17 +116,15 @@ bool QUmlGeneralization::isSubstitutable() const { // This is a read-write property - QM_D(const QUmlGeneralization); - return d->isSubstitutable; + return _isSubstitutable; } void QUmlGeneralization::setSubstitutable(bool isSubstitutable) { // This is a read-write property - QM_D(QUmlGeneralization); - if (d->isSubstitutable != isSubstitutable) { - d->isSubstitutable = isSubstitutable; + if (_isSubstitutable != isSubstitutable) { + _isSubstitutable = isSubstitutable; } } @@ -150,17 +135,15 @@ QUmlClassifier *QUmlGeneralization::specific() const { // This is a read-write association end - QM_D(const QUmlGeneralization); - return d->specific; + return _specific; } void QUmlGeneralization::setSpecific(QUmlClassifier *specific) { // This is a read-write association end - QM_D(QUmlGeneralization); - if (d->specific != specific) { - d->specific = specific; + if (_specific != specific) { + _specific = specific; } } diff --git a/src/uml/qumlgeneralization.h b/src/uml/qumlgeneralization.h index f8439a01..6156033d 100644 --- a/src/uml/qumlgeneralization.h +++ b/src/uml/qumlgeneralization.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlClassifier; class QUmlGeneralizationSet; -class QUmlGeneralizationPrivate; class Q_UML_EXPORT QUmlGeneralization : public QUmlDirectedRelationship { public: - QUmlGeneralization(bool create_d_ptr = true); + QUmlGeneralization(); // Owned attributes QUmlClassifier *general() const; @@ -70,6 +69,12 @@ public: void setSubstitutable(bool isSubstitutable); QUmlClassifier *specific() const; void setSpecific(QUmlClassifier *specific); + +protected: + QUmlClassifier *_general; + QSet<QUmlGeneralizationSet *> _generalizationSet; + bool _isSubstitutable; + QUmlClassifier *_specific; }; QT_END_NAMESPACE diff --git a/src/uml/qumlgeneralization_p.h b/src/uml/qumlgeneralization_p.h deleted file mode 100644 index 8eb84842..00000000 --- a/src/uml/qumlgeneralization_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLGENERALIZATION_P_H -#define QUMLGENERALIZATION_P_H - -#include "QtUml/QUmlGeneralization" - -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlGeneralizationPrivate : public QUmlDirectedRelationshipPrivate -{ -public: - QUmlGeneralizationPrivate(); - - QUmlClassifier *general; - QSet<QUmlGeneralizationSet *> generalizationSet; - bool isSubstitutable; - QUmlClassifier *specific; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLGENERALIZATION_P_H - diff --git a/src/uml/qumlgeneralizationset.cpp b/src/uml/qumlgeneralizationset.cpp index 92066ebe..72f1433b 100644 --- a/src/uml/qumlgeneralizationset.cpp +++ b/src/uml/qumlgeneralizationset.cpp @@ -39,20 +39,12 @@ ** ****************************************************************************/ #include "qumlgeneralizationset.h" -#include "qumlgeneralizationset_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlGeneralization> QT_BEGIN_NAMESPACE -QUmlGeneralizationSetPrivate::QUmlGeneralizationSetPrivate() : - isCovering(false), - isDisjoint(false), - powertype(0) -{ -} - /*! \class QUmlGeneralizationSet @@ -61,11 +53,11 @@ QUmlGeneralizationSetPrivate::QUmlGeneralizationSetPrivate() : \brief A generalization set is a packageable element whose instances define collections of subsets of generalization relationships. */ -QUmlGeneralizationSet::QUmlGeneralizationSet(bool create_d_ptr) : - QUmlPackageableElement(false) +QUmlGeneralizationSet::QUmlGeneralizationSet() : + _isCovering(false), + _isDisjoint(false), + _powertype(0) { - if (create_d_ptr) - set_d_ptr(new QUmlGeneralizationSetPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QSet<QUmlGeneralization *> QUmlGeneralizationSet::generalization() const { // This is a read-write association end - QM_D(const QUmlGeneralizationSet); - return d->generalization; + return _generalization; } void QUmlGeneralizationSet::addGeneralization(QUmlGeneralization *generalization) { // This is a read-write association end - QM_D(QUmlGeneralizationSet); - if (!d->generalization.contains(generalization)) { - d->generalization.insert(generalization); + if (!_generalization.contains(generalization)) { + _generalization.insert(generalization); } } @@ -95,9 +85,8 @@ void QUmlGeneralizationSet::removeGeneralization(QUmlGeneralization *generalizat { // This is a read-write association end - QM_D(QUmlGeneralizationSet); - if (d->generalization.contains(generalization)) { - d->generalization.remove(generalization); + if (_generalization.contains(generalization)) { + _generalization.remove(generalization); } } @@ -108,17 +97,15 @@ bool QUmlGeneralizationSet::isCovering() const { // This is a read-write property - QM_D(const QUmlGeneralizationSet); - return d->isCovering; + return _isCovering; } void QUmlGeneralizationSet::setCovering(bool isCovering) { // This is a read-write property - QM_D(QUmlGeneralizationSet); - if (d->isCovering != isCovering) { - d->isCovering = isCovering; + if (_isCovering != isCovering) { + _isCovering = isCovering; } } @@ -129,17 +116,15 @@ bool QUmlGeneralizationSet::isDisjoint() const { // This is a read-write property - QM_D(const QUmlGeneralizationSet); - return d->isDisjoint; + return _isDisjoint; } void QUmlGeneralizationSet::setDisjoint(bool isDisjoint) { // This is a read-write property - QM_D(QUmlGeneralizationSet); - if (d->isDisjoint != isDisjoint) { - d->isDisjoint = isDisjoint; + if (_isDisjoint != isDisjoint) { + _isDisjoint = isDisjoint; } } @@ -150,17 +135,15 @@ QUmlClassifier *QUmlGeneralizationSet::powertype() const { // This is a read-write association end - QM_D(const QUmlGeneralizationSet); - return d->powertype; + return _powertype; } void QUmlGeneralizationSet::setPowertype(QUmlClassifier *powertype) { // This is a read-write association end - QM_D(QUmlGeneralizationSet); - if (d->powertype != powertype) { - d->powertype = powertype; + if (_powertype != powertype) { + _powertype = powertype; } } diff --git a/src/uml/qumlgeneralizationset.h b/src/uml/qumlgeneralizationset.h index 3ec176c7..c10bd205 100644 --- a/src/uml/qumlgeneralizationset.h +++ b/src/uml/qumlgeneralizationset.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlClassifier; class QUmlGeneralization; -class QUmlGeneralizationSetPrivate; class Q_UML_EXPORT QUmlGeneralizationSet : public QUmlPackageableElement { public: - QUmlGeneralizationSet(bool create_d_ptr = true); + QUmlGeneralizationSet(); // Owned attributes QSet<QUmlGeneralization *> generalization() const; @@ -70,6 +69,12 @@ public: void setDisjoint(bool isDisjoint); QUmlClassifier *powertype() const; void setPowertype(QUmlClassifier *powertype); + +protected: + QSet<QUmlGeneralization *> _generalization; + bool _isCovering; + bool _isDisjoint; + QUmlClassifier *_powertype; }; QT_END_NAMESPACE diff --git a/src/uml/qumlgeneralizationset_p.h b/src/uml/qumlgeneralizationset_p.h deleted file mode 100644 index 45c5ecf3..00000000 --- a/src/uml/qumlgeneralizationset_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLGENERALIZATIONSET_P_H -#define QUMLGENERALIZATIONSET_P_H - -#include "QtUml/QUmlGeneralizationSet" - -#include "private/qumlpackageableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlGeneralizationSetPrivate : public QUmlPackageableElementPrivate -{ -public: - QUmlGeneralizationSetPrivate(); - - QSet<QUmlGeneralization *> generalization; - bool isCovering; - bool isDisjoint; - QUmlClassifier *powertype; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLGENERALIZATIONSET_P_H - diff --git a/src/uml/qumlgeneralordering.cpp b/src/uml/qumlgeneralordering.cpp index 68b517d9..c7c6953d 100644 --- a/src/uml/qumlgeneralordering.cpp +++ b/src/uml/qumlgeneralordering.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlgeneralordering.h" -#include "qumlgeneralordering_p.h" #include <QtUml/QUmlOccurrenceSpecification> QT_BEGIN_NAMESPACE -QUmlGeneralOrderingPrivate::QUmlGeneralOrderingPrivate() : - after(0), - before(0) -{ -} - /*! \class QUmlGeneralOrdering @@ -59,11 +52,10 @@ QUmlGeneralOrderingPrivate::QUmlGeneralOrderingPrivate() : \brief A general ordering represents a binary relation between two occurrence specifications, to describe that one occurrence specification must occur before the other in a valid trace. This mechanism provides the ability to define partial orders of occurrence cpecifications that may otherwise not have a specified order. */ -QUmlGeneralOrdering::QUmlGeneralOrdering(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlGeneralOrdering::QUmlGeneralOrdering() : + _after(0), + _before(0) { - if (create_d_ptr) - set_d_ptr(new QUmlGeneralOrderingPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlOccurrenceSpecification *QUmlGeneralOrdering::after() const { // This is a read-write association end - QM_D(const QUmlGeneralOrdering); - return d->after; + return _after; } void QUmlGeneralOrdering::setAfter(QUmlOccurrenceSpecification *after) { // This is a read-write association end - QM_D(QUmlGeneralOrdering); - if (d->after != after) { - d->after = after; + if (_after != after) { + _after = after; } } @@ -96,17 +86,15 @@ QUmlOccurrenceSpecification *QUmlGeneralOrdering::before() const { // This is a read-write association end - QM_D(const QUmlGeneralOrdering); - return d->before; + return _before; } void QUmlGeneralOrdering::setBefore(QUmlOccurrenceSpecification *before) { // This is a read-write association end - QM_D(QUmlGeneralOrdering); - if (d->before != before) { - d->before = before; + if (_before != before) { + _before = before; } } diff --git a/src/uml/qumlgeneralordering.h b/src/uml/qumlgeneralordering.h index 8926dc83..dae18e79 100644 --- a/src/uml/qumlgeneralordering.h +++ b/src/uml/qumlgeneralordering.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlOccurrenceSpecification; -class QUmlGeneralOrderingPrivate; class Q_UML_EXPORT QUmlGeneralOrdering : public QUmlNamedElement { public: - QUmlGeneralOrdering(bool create_d_ptr = true); + QUmlGeneralOrdering(); // Owned attributes QUmlOccurrenceSpecification *after() const; void setAfter(QUmlOccurrenceSpecification *after); QUmlOccurrenceSpecification *before() const; void setBefore(QUmlOccurrenceSpecification *before); + +protected: + QUmlOccurrenceSpecification *_after; + QUmlOccurrenceSpecification *_before; }; QT_END_NAMESPACE diff --git a/src/uml/qumlgeneralordering_p.h b/src/uml/qumlgeneralordering_p.h deleted file mode 100644 index 5b25ffa4..00000000 --- a/src/uml/qumlgeneralordering_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLGENERALORDERING_P_H -#define QUMLGENERALORDERING_P_H - -#include "QtUml/QUmlGeneralOrdering" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlGeneralOrderingPrivate : public QUmlNamedElementPrivate -{ -public: - QUmlGeneralOrderingPrivate(); - - QUmlOccurrenceSpecification *after; - QUmlOccurrenceSpecification *before; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLGENERALORDERING_P_H - diff --git a/src/uml/qumlimage.cpp b/src/uml/qumlimage.cpp index c12afcbb..919ba22c 100644 --- a/src/uml/qumlimage.cpp +++ b/src/uml/qumlimage.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlimage.h" -#include "qumlimage_p.h" QT_BEGIN_NAMESPACE -QUmlImagePrivate::QUmlImagePrivate() -{ -} - /*! \class QUmlImage @@ -55,11 +50,8 @@ QUmlImagePrivate::QUmlImagePrivate() \brief Physical definition of a graphical image. */ -QUmlImage::QUmlImage(bool create_d_ptr) : - QUmlElement(false) +QUmlImage::QUmlImage() { - if (create_d_ptr) - set_d_ptr(new QUmlImagePrivate); } // OWNED ATTRIBUTES @@ -71,17 +63,15 @@ QString QUmlImage::content() const { // This is a read-write property - QM_D(const QUmlImage); - return d->content; + return _content; } void QUmlImage::setContent(QString content) { // This is a read-write property - QM_D(QUmlImage); - if (d->content != content) { - d->content = content; + if (_content != content) { + _content = content; } } @@ -92,17 +82,15 @@ QString QUmlImage::format() const { // This is a read-write property - QM_D(const QUmlImage); - return d->format; + return _format; } void QUmlImage::setFormat(QString format) { // This is a read-write property - QM_D(QUmlImage); - if (d->format != format) { - d->format = format; + if (_format != format) { + _format = format; } } @@ -113,17 +101,15 @@ QString QUmlImage::location() const { // This is a read-write property - QM_D(const QUmlImage); - return d->location; + return _location; } void QUmlImage::setLocation(QString location) { // This is a read-write property - QM_D(QUmlImage); - if (d->location != location) { - d->location = location; + if (_location != location) { + _location = location; } } diff --git a/src/uml/qumlimage.h b/src/uml/qumlimage.h index 60e46873..5da15e79 100644 --- a/src/uml/qumlimage.h +++ b/src/uml/qumlimage.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlImagePrivate; class Q_UML_EXPORT QUmlImage : public QUmlElement { public: - QUmlImage(bool create_d_ptr = true); + QUmlImage(); // Owned attributes QString content() const; @@ -64,6 +63,11 @@ public: void setFormat(QString format); QString location() const; void setLocation(QString location); + +protected: + QString _content; + QString _format; + QString _location; }; QT_END_NAMESPACE diff --git a/src/uml/qumlimage_p.h b/src/uml/qumlimage_p.h deleted file mode 100644 index 34c9f231..00000000 --- a/src/uml/qumlimage_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLIMAGE_P_H -#define QUMLIMAGE_P_H - -#include "QtUml/QUmlImage" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlImagePrivate : public QUmlElementPrivate -{ -public: - QUmlImagePrivate(); - - QString content; - QString format; - QString location; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLIMAGE_P_H - diff --git a/src/uml/qumlinclude.cpp b/src/uml/qumlinclude.cpp index 25d357e8..e0f0124d 100644 --- a/src/uml/qumlinclude.cpp +++ b/src/uml/qumlinclude.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlinclude.h" -#include "qumlinclude_p.h" #include <QtUml/QUmlUseCase> QT_BEGIN_NAMESPACE -QUmlIncludePrivate::QUmlIncludePrivate() : - addition(0), - includingCase(0) -{ -} - /*! \class QUmlInclude @@ -59,12 +52,10 @@ QUmlIncludePrivate::QUmlIncludePrivate() : \brief An include relationship defines that a use case contains the behavior defined in another use case. */ -QUmlInclude::QUmlInclude(bool create_d_ptr) : - QUmlDirectedRelationship(false), - QUmlNamedElement(false) +QUmlInclude::QUmlInclude() : + _addition(0), + _includingCase(0) { - if (create_d_ptr) - set_d_ptr(new QUmlIncludePrivate); } // OWNED ATTRIBUTES @@ -76,17 +67,15 @@ QUmlUseCase *QUmlInclude::addition() const { // This is a read-write association end - QM_D(const QUmlInclude); - return d->addition; + return _addition; } void QUmlInclude::setAddition(QUmlUseCase *addition) { // This is a read-write association end - QM_D(QUmlInclude); - if (d->addition != addition) { - d->addition = addition; + if (_addition != addition) { + _addition = addition; } } @@ -97,17 +86,15 @@ QUmlUseCase *QUmlInclude::includingCase() const { // This is a read-write association end - QM_D(const QUmlInclude); - return d->includingCase; + return _includingCase; } void QUmlInclude::setIncludingCase(QUmlUseCase *includingCase) { // This is a read-write association end - QM_D(QUmlInclude); - if (d->includingCase != includingCase) { - d->includingCase = includingCase; + if (_includingCase != includingCase) { + _includingCase = includingCase; } } diff --git a/src/uml/qumlinclude.h b/src/uml/qumlinclude.h index 6bae493a..0f15f89b 100644 --- a/src/uml/qumlinclude.h +++ b/src/uml/qumlinclude.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlUseCase; -class QUmlIncludePrivate; class Q_UML_EXPORT QUmlInclude : public QUmlDirectedRelationship, public QUmlNamedElement { public: - QUmlInclude(bool create_d_ptr = true); + QUmlInclude(); // Owned attributes QUmlUseCase *addition() const; void setAddition(QUmlUseCase *addition); QUmlUseCase *includingCase() const; void setIncludingCase(QUmlUseCase *includingCase); + +protected: + QUmlUseCase *_addition; + QUmlUseCase *_includingCase; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinclude_p.h b/src/uml/qumlinclude_p.h deleted file mode 100644 index 1bf2d3c9..00000000 --- a/src/uml/qumlinclude_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINCLUDE_P_H -#define QUMLINCLUDE_P_H - -#include "QtUml/QUmlInclude" - -#include "private/qumldirectedrelationship_p.h" -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlIncludePrivate : public QUmlDirectedRelationshipPrivate, public QUmlNamedElementPrivate -{ -public: - QUmlIncludePrivate(); - - QUmlUseCase *addition; - QUmlUseCase *includingCase; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINCLUDE_P_H - diff --git a/src/uml/qumlinformationflow.cpp b/src/uml/qumlinformationflow.cpp index 2f47b485..d65418b1 100644 --- a/src/uml/qumlinformationflow.cpp +++ b/src/uml/qumlinformationflow.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlinformationflow.h" -#include "qumlinformationflow_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlClassifier> @@ -50,10 +49,6 @@ QT_BEGIN_NAMESPACE -QUmlInformationFlowPrivate::QUmlInformationFlowPrivate() -{ -} - /*! \class QUmlInformationFlow @@ -62,12 +57,8 @@ QUmlInformationFlowPrivate::QUmlInformationFlowPrivate() \brief An information flow specifies that one or more information items circulates from its sources to its targets. Information flows require some kind of information channel for transmitting information items from the source to the destination. An information channel is represented in various ways depending on the nature of its sources and targets. It may be represented by connectors, links, associations, or even dependencies. For example, if the source and destination are parts in some composite structure such as a collaboration, then the information channel is likely to be represented by a connector between them. Or, if the source and target are objects (which are a kind of instance specification), they may be represented by a link that joins the two, and so on. */ -QUmlInformationFlow::QUmlInformationFlow(bool create_d_ptr) : - QUmlDirectedRelationship(false), - QUmlPackageableElement(false) +QUmlInformationFlow::QUmlInformationFlow() { - if (create_d_ptr) - set_d_ptr(new QUmlInformationFlowPrivate); } // OWNED ATTRIBUTES @@ -79,17 +70,15 @@ QSet<QUmlClassifier *> QUmlInformationFlow::conveyed() const { // This is a read-write association end - QM_D(const QUmlInformationFlow); - return d->conveyed; + return _conveyed; } void QUmlInformationFlow::addConveyed(QUmlClassifier *conveyed) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (!d->conveyed.contains(conveyed)) { - d->conveyed.insert(conveyed); + if (!_conveyed.contains(conveyed)) { + _conveyed.insert(conveyed); } } @@ -97,9 +86,8 @@ void QUmlInformationFlow::removeConveyed(QUmlClassifier *conveyed) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (d->conveyed.contains(conveyed)) { - d->conveyed.remove(conveyed); + if (_conveyed.contains(conveyed)) { + _conveyed.remove(conveyed); } } @@ -110,17 +98,15 @@ QSet<QUmlNamedElement *> QUmlInformationFlow::informationSource() const { // This is a read-write association end - QM_D(const QUmlInformationFlow); - return d->informationSource; + return _informationSource; } void QUmlInformationFlow::addInformationSource(QUmlNamedElement *informationSource) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (!d->informationSource.contains(informationSource)) { - d->informationSource.insert(informationSource); + if (!_informationSource.contains(informationSource)) { + _informationSource.insert(informationSource); } } @@ -128,9 +114,8 @@ void QUmlInformationFlow::removeInformationSource(QUmlNamedElement *informationS { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (d->informationSource.contains(informationSource)) { - d->informationSource.remove(informationSource); + if (_informationSource.contains(informationSource)) { + _informationSource.remove(informationSource); } } @@ -141,17 +126,15 @@ QSet<QUmlNamedElement *> QUmlInformationFlow::informationTarget() const { // This is a read-write association end - QM_D(const QUmlInformationFlow); - return d->informationTarget; + return _informationTarget; } void QUmlInformationFlow::addInformationTarget(QUmlNamedElement *informationTarget) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (!d->informationTarget.contains(informationTarget)) { - d->informationTarget.insert(informationTarget); + if (!_informationTarget.contains(informationTarget)) { + _informationTarget.insert(informationTarget); } } @@ -159,9 +142,8 @@ void QUmlInformationFlow::removeInformationTarget(QUmlNamedElement *informationT { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (d->informationTarget.contains(informationTarget)) { - d->informationTarget.remove(informationTarget); + if (_informationTarget.contains(informationTarget)) { + _informationTarget.remove(informationTarget); } } @@ -172,17 +154,15 @@ QSet<QUmlRelationship *> QUmlInformationFlow::realization() const { // This is a read-write association end - QM_D(const QUmlInformationFlow); - return d->realization; + return _realization; } void QUmlInformationFlow::addRealization(QUmlRelationship *realization) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (!d->realization.contains(realization)) { - d->realization.insert(realization); + if (!_realization.contains(realization)) { + _realization.insert(realization); } } @@ -190,9 +170,8 @@ void QUmlInformationFlow::removeRealization(QUmlRelationship *realization) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (d->realization.contains(realization)) { - d->realization.remove(realization); + if (_realization.contains(realization)) { + _realization.remove(realization); } } @@ -203,17 +182,15 @@ QSet<QUmlActivityEdge *> QUmlInformationFlow::realizingActivityEdge() const { // This is a read-write association end - QM_D(const QUmlInformationFlow); - return d->realizingActivityEdge; + return _realizingActivityEdge; } void QUmlInformationFlow::addRealizingActivityEdge(QUmlActivityEdge *realizingActivityEdge) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (!d->realizingActivityEdge.contains(realizingActivityEdge)) { - d->realizingActivityEdge.insert(realizingActivityEdge); + if (!_realizingActivityEdge.contains(realizingActivityEdge)) { + _realizingActivityEdge.insert(realizingActivityEdge); } } @@ -221,9 +198,8 @@ void QUmlInformationFlow::removeRealizingActivityEdge(QUmlActivityEdge *realizin { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (d->realizingActivityEdge.contains(realizingActivityEdge)) { - d->realizingActivityEdge.remove(realizingActivityEdge); + if (_realizingActivityEdge.contains(realizingActivityEdge)) { + _realizingActivityEdge.remove(realizingActivityEdge); } } @@ -234,17 +210,15 @@ QSet<QUmlConnector *> QUmlInformationFlow::realizingConnector() const { // This is a read-write association end - QM_D(const QUmlInformationFlow); - return d->realizingConnector; + return _realizingConnector; } void QUmlInformationFlow::addRealizingConnector(QUmlConnector *realizingConnector) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (!d->realizingConnector.contains(realizingConnector)) { - d->realizingConnector.insert(realizingConnector); + if (!_realizingConnector.contains(realizingConnector)) { + _realizingConnector.insert(realizingConnector); } } @@ -252,9 +226,8 @@ void QUmlInformationFlow::removeRealizingConnector(QUmlConnector *realizingConne { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (d->realizingConnector.contains(realizingConnector)) { - d->realizingConnector.remove(realizingConnector); + if (_realizingConnector.contains(realizingConnector)) { + _realizingConnector.remove(realizingConnector); } } @@ -265,17 +238,15 @@ QSet<QUmlMessage *> QUmlInformationFlow::realizingMessage() const { // This is a read-write association end - QM_D(const QUmlInformationFlow); - return d->realizingMessage; + return _realizingMessage; } void QUmlInformationFlow::addRealizingMessage(QUmlMessage *realizingMessage) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (!d->realizingMessage.contains(realizingMessage)) { - d->realizingMessage.insert(realizingMessage); + if (!_realizingMessage.contains(realizingMessage)) { + _realizingMessage.insert(realizingMessage); } } @@ -283,9 +254,8 @@ void QUmlInformationFlow::removeRealizingMessage(QUmlMessage *realizingMessage) { // This is a read-write association end - QM_D(QUmlInformationFlow); - if (d->realizingMessage.contains(realizingMessage)) { - d->realizingMessage.remove(realizingMessage); + if (_realizingMessage.contains(realizingMessage)) { + _realizingMessage.remove(realizingMessage); } } diff --git a/src/uml/qumlinformationflow.h b/src/uml/qumlinformationflow.h index 88f4f13f..a0c138b2 100644 --- a/src/uml/qumlinformationflow.h +++ b/src/uml/qumlinformationflow.h @@ -59,11 +59,10 @@ class QUmlMessage; class QUmlNamedElement; class QUmlRelationship; -class QUmlInformationFlowPrivate; class Q_UML_EXPORT QUmlInformationFlow : public QUmlDirectedRelationship, public QUmlPackageableElement { public: - QUmlInformationFlow(bool create_d_ptr = true); + QUmlInformationFlow(); // Owned attributes QSet<QUmlClassifier *> conveyed() const; @@ -87,6 +86,15 @@ public: QSet<QUmlMessage *> realizingMessage() const; void addRealizingMessage(QUmlMessage *realizingMessage); void removeRealizingMessage(QUmlMessage *realizingMessage); + +protected: + QSet<QUmlClassifier *> _conveyed; + QSet<QUmlNamedElement *> _informationSource; + QSet<QUmlNamedElement *> _informationTarget; + QSet<QUmlRelationship *> _realization; + QSet<QUmlActivityEdge *> _realizingActivityEdge; + QSet<QUmlConnector *> _realizingConnector; + QSet<QUmlMessage *> _realizingMessage; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinformationflow_p.h b/src/uml/qumlinformationflow_p.h deleted file mode 100644 index f72e3080..00000000 --- a/src/uml/qumlinformationflow_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINFORMATIONFLOW_P_H -#define QUMLINFORMATIONFLOW_P_H - -#include "QtUml/QUmlInformationFlow" - -#include "private/qumldirectedrelationship_p.h" -#include "private/qumlpackageableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInformationFlowPrivate : public QUmlDirectedRelationshipPrivate, public QUmlPackageableElementPrivate -{ -public: - QUmlInformationFlowPrivate(); - - QSet<QUmlClassifier *> conveyed; - QSet<QUmlNamedElement *> informationSource; - QSet<QUmlNamedElement *> informationTarget; - QSet<QUmlRelationship *> realization; - QSet<QUmlActivityEdge *> realizingActivityEdge; - QSet<QUmlConnector *> realizingConnector; - QSet<QUmlMessage *> realizingMessage; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINFORMATIONFLOW_P_H - diff --git a/src/uml/qumlinformationitem.cpp b/src/uml/qumlinformationitem.cpp index 4e178032..0a21daf4 100644 --- a/src/uml/qumlinformationitem.cpp +++ b/src/uml/qumlinformationitem.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlinformationitem.h" -#include "qumlinformationitem_p.h" QT_BEGIN_NAMESPACE -QUmlInformationItemPrivate::QUmlInformationItemPrivate() -{ -} - /*! \class QUmlInformationItem @@ -55,11 +50,8 @@ QUmlInformationItemPrivate::QUmlInformationItemPrivate() \brief An information item is an abstraction of all kinds of information that can be exchanged between objects. It is a kind of classifier intended for representing information in a very abstract way, one which cannot be instantiated. */ -QUmlInformationItem::QUmlInformationItem(bool create_d_ptr) : - QUmlClassifier(false) +QUmlInformationItem::QUmlInformationItem() { - if (create_d_ptr) - set_d_ptr(new QUmlInformationItemPrivate); } // OWNED ATTRIBUTES @@ -71,17 +63,15 @@ QSet<QUmlClassifier *> QUmlInformationItem::represented() const { // This is a read-write association end - QM_D(const QUmlInformationItem); - return d->represented; + return _represented; } void QUmlInformationItem::addRepresented(QUmlClassifier *represented) { // This is a read-write association end - QM_D(QUmlInformationItem); - if (!d->represented.contains(represented)) { - d->represented.insert(represented); + if (!_represented.contains(represented)) { + _represented.insert(represented); } } @@ -89,9 +79,8 @@ void QUmlInformationItem::removeRepresented(QUmlClassifier *represented) { // This is a read-write association end - QM_D(QUmlInformationItem); - if (d->represented.contains(represented)) { - d->represented.remove(represented); + if (_represented.contains(represented)) { + _represented.remove(represented); } } diff --git a/src/uml/qumlinformationitem.h b/src/uml/qumlinformationitem.h index 556f3dc8..a068f400 100644 --- a/src/uml/qumlinformationitem.h +++ b/src/uml/qumlinformationitem.h @@ -51,16 +51,18 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlInformationItemPrivate; class Q_UML_EXPORT QUmlInformationItem : public QUmlClassifier { public: - QUmlInformationItem(bool create_d_ptr = true); + QUmlInformationItem(); // Owned attributes QSet<QUmlClassifier *> represented() const; void addRepresented(QUmlClassifier *represented); void removeRepresented(QUmlClassifier *represented); + +protected: + QSet<QUmlClassifier *> _represented; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinformationitem_p.h b/src/uml/qumlinformationitem_p.h deleted file mode 100644 index 7d2f2f17..00000000 --- a/src/uml/qumlinformationitem_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINFORMATIONITEM_P_H -#define QUMLINFORMATIONITEM_P_H - -#include "QtUml/QUmlInformationItem" - -#include "private/qumlclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInformationItemPrivate : public QUmlClassifierPrivate -{ -public: - QUmlInformationItemPrivate(); - - QSet<QUmlClassifier *> represented; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINFORMATIONITEM_P_H - diff --git a/src/uml/qumlinitialnode.cpp b/src/uml/qumlinitialnode.cpp index 643e9bda..2f57228f 100644 --- a/src/uml/qumlinitialnode.cpp +++ b/src/uml/qumlinitialnode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlinitialnode.h" -#include "qumlinitialnode_p.h" QT_BEGIN_NAMESPACE -QUmlInitialNodePrivate::QUmlInitialNodePrivate() -{ -} - /*! \class QUmlInitialNode @@ -55,11 +50,8 @@ QUmlInitialNodePrivate::QUmlInitialNodePrivate() \brief An initial node is a control node at which flow starts when the activity is invoked. */ -QUmlInitialNode::QUmlInitialNode(bool create_d_ptr) : - QUmlControlNode(false) +QUmlInitialNode::QUmlInitialNode() { - if (create_d_ptr) - set_d_ptr(new QUmlInitialNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlinitialnode.h b/src/uml/qumlinitialnode.h index af52e5b4..110d9075 100644 --- a/src/uml/qumlinitialnode.h +++ b/src/uml/qumlinitialnode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlInitialNodePrivate; class Q_UML_EXPORT QUmlInitialNode : public QUmlControlNode { public: - QUmlInitialNode(bool create_d_ptr = true); + QUmlInitialNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlinitialnode_p.h b/src/uml/qumlinitialnode_p.h deleted file mode 100644 index 9ffbe704..00000000 --- a/src/uml/qumlinitialnode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINITIALNODE_P_H -#define QUMLINITIALNODE_P_H - -#include "QtUml/QUmlInitialNode" - -#include "private/qumlcontrolnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInitialNodePrivate : public QUmlControlNodePrivate -{ -public: - QUmlInitialNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINITIALNODE_P_H - diff --git a/src/uml/qumlinputpin.cpp b/src/uml/qumlinputpin.cpp index 84cea7df..afb1b4da 100644 --- a/src/uml/qumlinputpin.cpp +++ b/src/uml/qumlinputpin.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlinputpin.h" -#include "qumlinputpin_p.h" QT_BEGIN_NAMESPACE -QUmlInputPinPrivate::QUmlInputPinPrivate() -{ -} - /*! \class QUmlInputPin @@ -55,11 +50,8 @@ QUmlInputPinPrivate::QUmlInputPinPrivate() \brief An input pin is a pin that holds input values to be consumed by an action. */ -QUmlInputPin::QUmlInputPin(bool create_d_ptr) : - QUmlPin(false) +QUmlInputPin::QUmlInputPin() { - if (create_d_ptr) - set_d_ptr(new QUmlInputPinPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlinputpin.h b/src/uml/qumlinputpin.h index ce1b0f86..5751d016 100644 --- a/src/uml/qumlinputpin.h +++ b/src/uml/qumlinputpin.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlInputPinPrivate; class Q_UML_EXPORT QUmlInputPin : public QUmlPin { public: - QUmlInputPin(bool create_d_ptr = true); + QUmlInputPin(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlinputpin_p.h b/src/uml/qumlinputpin_p.h deleted file mode 100644 index 38d77099..00000000 --- a/src/uml/qumlinputpin_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINPUTPIN_P_H -#define QUMLINPUTPIN_P_H - -#include "QtUml/QUmlInputPin" - -#include "private/qumlpin_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInputPinPrivate : public QUmlPinPrivate -{ -public: - QUmlInputPinPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINPUTPIN_P_H - diff --git a/src/uml/qumlinstancespecification.cpp b/src/uml/qumlinstancespecification.cpp index a06373a2..1b4e6d40 100644 --- a/src/uml/qumlinstancespecification.cpp +++ b/src/uml/qumlinstancespecification.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlinstancespecification.h" -#include "qumlinstancespecification_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlSlot> @@ -47,11 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlInstanceSpecificationPrivate::QUmlInstanceSpecificationPrivate() : - specification(0) -{ -} - /*! \class QUmlInstanceSpecification @@ -60,13 +54,9 @@ QUmlInstanceSpecificationPrivate::QUmlInstanceSpecificationPrivate() : \brief An instance specification has the capability of being a deployment target in a deployment relationship, in the case that it is an instance of a node. It is also has the capability of being a deployed artifact, if it is an instance of an artifact.An instance specification is a model element that represents an instance in a modeled system. */ -QUmlInstanceSpecification::QUmlInstanceSpecification(bool create_d_ptr) : - QUmlDeployedArtifact(false), - QUmlPackageableElement(false), - QUmlDeploymentTarget(false) +QUmlInstanceSpecification::QUmlInstanceSpecification() : + _specification(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInstanceSpecificationPrivate); } // OWNED ATTRIBUTES @@ -78,17 +68,15 @@ QSet<QUmlClassifier *> QUmlInstanceSpecification::classifier() const { // This is a read-write association end - QM_D(const QUmlInstanceSpecification); - return d->classifier; + return _classifier; } void QUmlInstanceSpecification::addClassifier(QUmlClassifier *classifier) { // This is a read-write association end - QM_D(QUmlInstanceSpecification); - if (!d->classifier.contains(classifier)) { - d->classifier.insert(classifier); + if (!_classifier.contains(classifier)) { + _classifier.insert(classifier); } } @@ -96,9 +84,8 @@ void QUmlInstanceSpecification::removeClassifier(QUmlClassifier *classifier) { // This is a read-write association end - QM_D(QUmlInstanceSpecification); - if (d->classifier.contains(classifier)) { - d->classifier.remove(classifier); + if (_classifier.contains(classifier)) { + _classifier.remove(classifier); } } @@ -109,17 +96,15 @@ QSet<QUmlSlot *> QUmlInstanceSpecification::slot_() const { // This is a read-write association end - QM_D(const QUmlInstanceSpecification); - return d->slot_; + return _slot_; } void QUmlInstanceSpecification::addSlot(QUmlSlot *slot_) { // This is a read-write association end - QM_D(QUmlInstanceSpecification); - if (!d->slot_.contains(slot_)) { - d->slot_.insert(slot_); + if (!_slot_.contains(slot_)) { + _slot_.insert(slot_); } } @@ -127,9 +112,8 @@ void QUmlInstanceSpecification::removeSlot(QUmlSlot *slot_) { // This is a read-write association end - QM_D(QUmlInstanceSpecification); - if (d->slot_.contains(slot_)) { - d->slot_.remove(slot_); + if (_slot_.contains(slot_)) { + _slot_.remove(slot_); } } @@ -140,17 +124,15 @@ QUmlValueSpecification *QUmlInstanceSpecification::specification() const { // This is a read-write association end - QM_D(const QUmlInstanceSpecification); - return d->specification; + return _specification; } void QUmlInstanceSpecification::setSpecification(QUmlValueSpecification *specification) { // This is a read-write association end - QM_D(QUmlInstanceSpecification); - if (d->specification != specification) { - d->specification = specification; + if (_specification != specification) { + _specification = specification; } } diff --git a/src/uml/qumlinstancespecification.h b/src/uml/qumlinstancespecification.h index a8877bb6..51f8a38a 100644 --- a/src/uml/qumlinstancespecification.h +++ b/src/uml/qumlinstancespecification.h @@ -57,11 +57,10 @@ class QUmlClassifier; class QUmlSlot; class QUmlValueSpecification; -class QUmlInstanceSpecificationPrivate; class Q_UML_EXPORT QUmlInstanceSpecification : public QUmlDeployedArtifact, public QUmlPackageableElement, public QUmlDeploymentTarget { public: - QUmlInstanceSpecification(bool create_d_ptr = true); + QUmlInstanceSpecification(); // Owned attributes QSet<QUmlClassifier *> classifier() const; @@ -72,6 +71,11 @@ public: void removeSlot(QUmlSlot *slot_); QUmlValueSpecification *specification() const; void setSpecification(QUmlValueSpecification *specification); + +protected: + QSet<QUmlClassifier *> _classifier; + QSet<QUmlSlot *> _slot_; + QUmlValueSpecification *_specification; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinstancespecification_p.h b/src/uml/qumlinstancespecification_p.h deleted file mode 100644 index 851f826d..00000000 --- a/src/uml/qumlinstancespecification_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINSTANCESPECIFICATION_P_H -#define QUMLINSTANCESPECIFICATION_P_H - -#include "QtUml/QUmlInstanceSpecification" - -#include "private/qumldeployedartifact_p.h" -#include "private/qumlpackageableelement_p.h" -#include "private/qumldeploymenttarget_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInstanceSpecificationPrivate : public QUmlDeployedArtifactPrivate, public QUmlPackageableElementPrivate, public QUmlDeploymentTargetPrivate -{ -public: - QUmlInstanceSpecificationPrivate(); - - QSet<QUmlClassifier *> classifier; - QSet<QUmlSlot *> slot_; - QUmlValueSpecification *specification; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINSTANCESPECIFICATION_P_H - diff --git a/src/uml/qumlinstancevalue.cpp b/src/uml/qumlinstancevalue.cpp index 8225b6b2..95feebaa 100644 --- a/src/uml/qumlinstancevalue.cpp +++ b/src/uml/qumlinstancevalue.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlinstancevalue.h" -#include "qumlinstancevalue_p.h" #include <QtUml/QUmlInstanceSpecification> QT_BEGIN_NAMESPACE -QUmlInstanceValuePrivate::QUmlInstanceValuePrivate() : - instance(0) -{ -} - /*! \class QUmlInstanceValue @@ -58,11 +52,9 @@ QUmlInstanceValuePrivate::QUmlInstanceValuePrivate() : \brief An instance value is a value specification that identifies an instance. */ -QUmlInstanceValue::QUmlInstanceValue(bool create_d_ptr) : - QUmlValueSpecification(false) +QUmlInstanceValue::QUmlInstanceValue() : + _instance(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInstanceValuePrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlInstanceSpecification *QUmlInstanceValue::instance() const { // This is a read-write association end - QM_D(const QUmlInstanceValue); - return d->instance; + return _instance; } void QUmlInstanceValue::setInstance(QUmlInstanceSpecification *instance) { // This is a read-write association end - QM_D(QUmlInstanceValue); - if (d->instance != instance) { - d->instance = instance; + if (_instance != instance) { + _instance = instance; } } diff --git a/src/uml/qumlinstancevalue.h b/src/uml/qumlinstancevalue.h index 6f5eea46..7f835250 100644 --- a/src/uml/qumlinstancevalue.h +++ b/src/uml/qumlinstancevalue.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlInstanceSpecification; -class QUmlInstanceValuePrivate; class Q_UML_EXPORT QUmlInstanceValue : public QUmlValueSpecification { public: - QUmlInstanceValue(bool create_d_ptr = true); + QUmlInstanceValue(); // Owned attributes QUmlInstanceSpecification *instance() const; void setInstance(QUmlInstanceSpecification *instance); + +protected: + QUmlInstanceSpecification *_instance; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinstancevalue_p.h b/src/uml/qumlinstancevalue_p.h deleted file mode 100644 index a39f16d8..00000000 --- a/src/uml/qumlinstancevalue_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINSTANCEVALUE_P_H -#define QUMLINSTANCEVALUE_P_H - -#include "QtUml/QUmlInstanceValue" - -#include "private/qumlvaluespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInstanceValuePrivate : public QUmlValueSpecificationPrivate -{ -public: - QUmlInstanceValuePrivate(); - - QUmlInstanceSpecification *instance; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINSTANCEVALUE_P_H - diff --git a/src/uml/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp index 4c5fee91..713d914f 100644 --- a/src/uml/qumlinteraction.cpp +++ b/src/uml/qumlinteraction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlinteraction.h" -#include "qumlinteraction_p.h" #include <QtUml/QUmlAction> #include <QtUml/QUmlGate> @@ -48,10 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlInteractionPrivate::QUmlInteractionPrivate() -{ -} - /*! \class QUmlInteraction @@ -60,12 +55,8 @@ QUmlInteractionPrivate::QUmlInteractionPrivate() \brief An interaction is a unit of behavior that focuses on the observable exchange of information between connectable elements. */ -QUmlInteraction::QUmlInteraction(bool create_d_ptr) : - QUmlBehavior(false), - QUmlInteractionFragment(false) +QUmlInteraction::QUmlInteraction() { - if (create_d_ptr) - set_d_ptr(new QUmlInteractionPrivate); } // OWNED ATTRIBUTES @@ -77,17 +68,15 @@ QSet<QUmlAction *> QUmlInteraction::action() const { // This is a read-write association end - QM_D(const QUmlInteraction); - return d->action; + return _action; } void QUmlInteraction::addAction(QUmlAction *action) { // This is a read-write association end - QM_D(QUmlInteraction); - if (!d->action.contains(action)) { - d->action.insert(action); + if (!_action.contains(action)) { + _action.insert(action); } } @@ -95,9 +84,8 @@ void QUmlInteraction::removeAction(QUmlAction *action) { // This is a read-write association end - QM_D(QUmlInteraction); - if (d->action.contains(action)) { - d->action.remove(action); + if (_action.contains(action)) { + _action.remove(action); } } @@ -108,17 +96,15 @@ QSet<QUmlGate *> QUmlInteraction::formalGate() const { // This is a read-write association end - QM_D(const QUmlInteraction); - return d->formalGate; + return _formalGate; } void QUmlInteraction::addFormalGate(QUmlGate *formalGate) { // This is a read-write association end - QM_D(QUmlInteraction); - if (!d->formalGate.contains(formalGate)) { - d->formalGate.insert(formalGate); + if (!_formalGate.contains(formalGate)) { + _formalGate.insert(formalGate); } } @@ -126,9 +112,8 @@ void QUmlInteraction::removeFormalGate(QUmlGate *formalGate) { // This is a read-write association end - QM_D(QUmlInteraction); - if (d->formalGate.contains(formalGate)) { - d->formalGate.remove(formalGate); + if (_formalGate.contains(formalGate)) { + _formalGate.remove(formalGate); } } @@ -139,17 +124,15 @@ QList<QUmlInteractionFragment *> QUmlInteraction::fragment() const { // This is a read-write association end - QM_D(const QUmlInteraction); - return d->fragment; + return _fragment; } void QUmlInteraction::addFragment(QUmlInteractionFragment *fragment) { // This is a read-write association end - QM_D(QUmlInteraction); - if (!d->fragment.contains(fragment)) { - d->fragment.append(fragment); + if (!_fragment.contains(fragment)) { + _fragment.append(fragment); } } @@ -157,9 +140,8 @@ void QUmlInteraction::removeFragment(QUmlInteractionFragment *fragment) { // This is a read-write association end - QM_D(QUmlInteraction); - if (d->fragment.contains(fragment)) { - d->fragment.removeAll(fragment); + if (_fragment.contains(fragment)) { + _fragment.removeAll(fragment); } } @@ -170,17 +152,15 @@ QSet<QUmlLifeline *> QUmlInteraction::lifeline() const { // This is a read-write association end - QM_D(const QUmlInteraction); - return d->lifeline; + return _lifeline; } void QUmlInteraction::addLifeline(QUmlLifeline *lifeline) { // This is a read-write association end - QM_D(QUmlInteraction); - if (!d->lifeline.contains(lifeline)) { - d->lifeline.insert(lifeline); + if (!_lifeline.contains(lifeline)) { + _lifeline.insert(lifeline); } } @@ -188,9 +168,8 @@ void QUmlInteraction::removeLifeline(QUmlLifeline *lifeline) { // This is a read-write association end - QM_D(QUmlInteraction); - if (d->lifeline.contains(lifeline)) { - d->lifeline.remove(lifeline); + if (_lifeline.contains(lifeline)) { + _lifeline.remove(lifeline); } } @@ -201,17 +180,15 @@ QSet<QUmlMessage *> QUmlInteraction::message() const { // This is a read-write association end - QM_D(const QUmlInteraction); - return d->message; + return _message; } void QUmlInteraction::addMessage(QUmlMessage *message) { // This is a read-write association end - QM_D(QUmlInteraction); - if (!d->message.contains(message)) { - d->message.insert(message); + if (!_message.contains(message)) { + _message.insert(message); } } @@ -219,9 +196,8 @@ void QUmlInteraction::removeMessage(QUmlMessage *message) { // This is a read-write association end - QM_D(QUmlInteraction); - if (d->message.contains(message)) { - d->message.remove(message); + if (_message.contains(message)) { + _message.remove(message); } } diff --git a/src/uml/qumlinteraction.h b/src/uml/qumlinteraction.h index ee102b61..04ee9359 100644 --- a/src/uml/qumlinteraction.h +++ b/src/uml/qumlinteraction.h @@ -57,11 +57,10 @@ class QUmlGate; class QUmlLifeline; class QUmlMessage; -class QUmlInteractionPrivate; class Q_UML_EXPORT QUmlInteraction : public QUmlBehavior, public QUmlInteractionFragment { public: - QUmlInteraction(bool create_d_ptr = true); + QUmlInteraction(); // Owned attributes QSet<QUmlAction *> action() const; @@ -79,6 +78,13 @@ public: QSet<QUmlMessage *> message() const; void addMessage(QUmlMessage *message); void removeMessage(QUmlMessage *message); + +protected: + QSet<QUmlAction *> _action; + QSet<QUmlGate *> _formalGate; + QList<QUmlInteractionFragment *> _fragment; + QSet<QUmlLifeline *> _lifeline; + QSet<QUmlMessage *> _message; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinteraction_p.h b/src/uml/qumlinteraction_p.h deleted file mode 100644 index 5b7d96b7..00000000 --- a/src/uml/qumlinteraction_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERACTION_P_H -#define QUMLINTERACTION_P_H - -#include "QtUml/QUmlInteraction" - -#include "private/qumlbehavior_p.h" -#include "private/qumlinteractionfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInteractionPrivate : public QUmlBehaviorPrivate, public QUmlInteractionFragmentPrivate -{ -public: - QUmlInteractionPrivate(); - - QSet<QUmlAction *> action; - QSet<QUmlGate *> formalGate; - QList<QUmlInteractionFragment *> fragment; - QSet<QUmlLifeline *> lifeline; - QSet<QUmlMessage *> message; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERACTION_P_H - diff --git a/src/uml/qumlinteractionconstraint.cpp b/src/uml/qumlinteractionconstraint.cpp index 88b4a139..d4fa906b 100644 --- a/src/uml/qumlinteractionconstraint.cpp +++ b/src/uml/qumlinteractionconstraint.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlinteractionconstraint.h" -#include "qumlinteractionconstraint_p.h" #include <QtUml/QUmlValueSpecification> QT_BEGIN_NAMESPACE -QUmlInteractionConstraintPrivate::QUmlInteractionConstraintPrivate() : - maxint(0), - minint(0) -{ -} - /*! \class QUmlInteractionConstraint @@ -59,11 +52,10 @@ QUmlInteractionConstraintPrivate::QUmlInteractionConstraintPrivate() : \brief An interaction constraint is a Boolean expression that guards an operand in a combined fragment. */ -QUmlInteractionConstraint::QUmlInteractionConstraint(bool create_d_ptr) : - QUmlConstraint(false) +QUmlInteractionConstraint::QUmlInteractionConstraint() : + _maxint(0), + _minint(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInteractionConstraintPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlValueSpecification *QUmlInteractionConstraint::maxint() const { // This is a read-write association end - QM_D(const QUmlInteractionConstraint); - return d->maxint; + return _maxint; } void QUmlInteractionConstraint::setMaxint(QUmlValueSpecification *maxint) { // This is a read-write association end - QM_D(QUmlInteractionConstraint); - if (d->maxint != maxint) { - d->maxint = maxint; + if (_maxint != maxint) { + _maxint = maxint; } } @@ -96,17 +86,15 @@ QUmlValueSpecification *QUmlInteractionConstraint::minint() const { // This is a read-write association end - QM_D(const QUmlInteractionConstraint); - return d->minint; + return _minint; } void QUmlInteractionConstraint::setMinint(QUmlValueSpecification *minint) { // This is a read-write association end - QM_D(QUmlInteractionConstraint); - if (d->minint != minint) { - d->minint = minint; + if (_minint != minint) { + _minint = minint; } } diff --git a/src/uml/qumlinteractionconstraint.h b/src/uml/qumlinteractionconstraint.h index 20fa01f0..1be8e581 100644 --- a/src/uml/qumlinteractionconstraint.h +++ b/src/uml/qumlinteractionconstraint.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlValueSpecification; -class QUmlInteractionConstraintPrivate; class Q_UML_EXPORT QUmlInteractionConstraint : public QUmlConstraint { public: - QUmlInteractionConstraint(bool create_d_ptr = true); + QUmlInteractionConstraint(); // Owned attributes QUmlValueSpecification *maxint() const; void setMaxint(QUmlValueSpecification *maxint); QUmlValueSpecification *minint() const; void setMinint(QUmlValueSpecification *minint); + +protected: + QUmlValueSpecification *_maxint; + QUmlValueSpecification *_minint; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinteractionconstraint_p.h b/src/uml/qumlinteractionconstraint_p.h deleted file mode 100644 index 54e23269..00000000 --- a/src/uml/qumlinteractionconstraint_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERACTIONCONSTRAINT_P_H -#define QUMLINTERACTIONCONSTRAINT_P_H - -#include "QtUml/QUmlInteractionConstraint" - -#include "private/qumlconstraint_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInteractionConstraintPrivate : public QUmlConstraintPrivate -{ -public: - QUmlInteractionConstraintPrivate(); - - QUmlValueSpecification *maxint; - QUmlValueSpecification *minint; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERACTIONCONSTRAINT_P_H - diff --git a/src/uml/qumlinteractionfragment.cpp b/src/uml/qumlinteractionfragment.cpp index 3a5b5bf3..b3909e54 100644 --- a/src/uml/qumlinteractionfragment.cpp +++ b/src/uml/qumlinteractionfragment.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlinteractionfragment.h" -#include "qumlinteractionfragment_p.h" #include <QtUml/QUmlGeneralOrdering> #include <QtUml/QUmlInteraction> @@ -48,12 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlInteractionFragmentPrivate::QUmlInteractionFragmentPrivate() : - enclosingInteraction(0), - enclosingOperand(0) -{ -} - /*! \class QUmlInteractionFragment @@ -62,11 +55,10 @@ QUmlInteractionFragmentPrivate::QUmlInteractionFragmentPrivate() : \brief InteractionFragment is an abstract notion of the most general interaction unit. An interaction fragment is a piece of an interaction. Each interaction fragment is conceptually like an interaction by itself. */ -QUmlInteractionFragment::QUmlInteractionFragment(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlInteractionFragment::QUmlInteractionFragment() : + _enclosingInteraction(0), + _enclosingOperand(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInteractionFragmentPrivate); } // OWNED ATTRIBUTES @@ -78,17 +70,15 @@ QSet<QUmlLifeline *> QUmlInteractionFragment::covered() const { // This is a read-write association end - QM_D(const QUmlInteractionFragment); - return d->covered; + return _covered; } void QUmlInteractionFragment::addCovered(QUmlLifeline *covered) { // This is a read-write association end - QM_D(QUmlInteractionFragment); - if (!d->covered.contains(covered)) { - d->covered.insert(covered); + if (!_covered.contains(covered)) { + _covered.insert(covered); } } @@ -96,9 +86,8 @@ void QUmlInteractionFragment::removeCovered(QUmlLifeline *covered) { // This is a read-write association end - QM_D(QUmlInteractionFragment); - if (d->covered.contains(covered)) { - d->covered.remove(covered); + if (_covered.contains(covered)) { + _covered.remove(covered); } } @@ -109,17 +98,15 @@ QUmlInteraction *QUmlInteractionFragment::enclosingInteraction() const { // This is a read-write association end - QM_D(const QUmlInteractionFragment); - return d->enclosingInteraction; + return _enclosingInteraction; } void QUmlInteractionFragment::setEnclosingInteraction(QUmlInteraction *enclosingInteraction) { // This is a read-write association end - QM_D(QUmlInteractionFragment); - if (d->enclosingInteraction != enclosingInteraction) { - d->enclosingInteraction = enclosingInteraction; + if (_enclosingInteraction != enclosingInteraction) { + _enclosingInteraction = enclosingInteraction; } } @@ -130,17 +117,15 @@ QUmlInteractionOperand *QUmlInteractionFragment::enclosingOperand() const { // This is a read-write association end - QM_D(const QUmlInteractionFragment); - return d->enclosingOperand; + return _enclosingOperand; } void QUmlInteractionFragment::setEnclosingOperand(QUmlInteractionOperand *enclosingOperand) { // This is a read-write association end - QM_D(QUmlInteractionFragment); - if (d->enclosingOperand != enclosingOperand) { - d->enclosingOperand = enclosingOperand; + if (_enclosingOperand != enclosingOperand) { + _enclosingOperand = enclosingOperand; } } @@ -151,17 +136,15 @@ QSet<QUmlGeneralOrdering *> QUmlInteractionFragment::generalOrdering() const { // This is a read-write association end - QM_D(const QUmlInteractionFragment); - return d->generalOrdering; + return _generalOrdering; } void QUmlInteractionFragment::addGeneralOrdering(QUmlGeneralOrdering *generalOrdering) { // This is a read-write association end - QM_D(QUmlInteractionFragment); - if (!d->generalOrdering.contains(generalOrdering)) { - d->generalOrdering.insert(generalOrdering); + if (!_generalOrdering.contains(generalOrdering)) { + _generalOrdering.insert(generalOrdering); } } @@ -169,9 +152,8 @@ void QUmlInteractionFragment::removeGeneralOrdering(QUmlGeneralOrdering *general { // This is a read-write association end - QM_D(QUmlInteractionFragment); - if (d->generalOrdering.contains(generalOrdering)) { - d->generalOrdering.remove(generalOrdering); + if (_generalOrdering.contains(generalOrdering)) { + _generalOrdering.remove(generalOrdering); } } diff --git a/src/uml/qumlinteractionfragment.h b/src/uml/qumlinteractionfragment.h index cca83e1c..5f22248b 100644 --- a/src/uml/qumlinteractionfragment.h +++ b/src/uml/qumlinteractionfragment.h @@ -56,11 +56,10 @@ class QUmlInteraction; class QUmlInteractionOperand; class QUmlLifeline; -class QUmlInteractionFragmentPrivate; class Q_UML_EXPORT QUmlInteractionFragment : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlInteractionFragment(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlInteractionFragment(); // Owned attributes QSet<QUmlLifeline *> covered() const; @@ -73,6 +72,12 @@ public: QSet<QUmlGeneralOrdering *> generalOrdering() const; void addGeneralOrdering(QUmlGeneralOrdering *generalOrdering); void removeGeneralOrdering(QUmlGeneralOrdering *generalOrdering); + +protected: + QSet<QUmlLifeline *> _covered; + QUmlInteraction *_enclosingInteraction; + QUmlInteractionOperand *_enclosingOperand; + QSet<QUmlGeneralOrdering *> _generalOrdering; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinteractionfragment_p.h b/src/uml/qumlinteractionfragment_p.h deleted file mode 100644 index f910eeb0..00000000 --- a/src/uml/qumlinteractionfragment_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERACTIONFRAGMENT_P_H -#define QUMLINTERACTIONFRAGMENT_P_H - -#include "QtUml/QUmlInteractionFragment" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInteractionFragmentPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlInteractionFragmentPrivate(); - - QSet<QUmlLifeline *> covered; - QUmlInteraction *enclosingInteraction; - QUmlInteractionOperand *enclosingOperand; - QSet<QUmlGeneralOrdering *> generalOrdering; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERACTIONFRAGMENT_P_H - diff --git a/src/uml/qumlinteractionoperand.cpp b/src/uml/qumlinteractionoperand.cpp index f7d4a6fe..7553e855 100644 --- a/src/uml/qumlinteractionoperand.cpp +++ b/src/uml/qumlinteractionoperand.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlinteractionoperand.h" -#include "qumlinteractionoperand_p.h" #include <QtUml/QUmlInteractionConstraint> QT_BEGIN_NAMESPACE -QUmlInteractionOperandPrivate::QUmlInteractionOperandPrivate() : - guard(0) -{ -} - /*! \class QUmlInteractionOperand @@ -58,12 +52,9 @@ QUmlInteractionOperandPrivate::QUmlInteractionOperandPrivate() : \brief An interaction operand is contained in a combined fragment. An interaction operand represents one operand of the expression given by the enclosing combined fragment. */ -QUmlInteractionOperand::QUmlInteractionOperand(bool create_d_ptr) : - QUmlInteractionFragment(false), - QUmlNamespace(false) +QUmlInteractionOperand::QUmlInteractionOperand() : + _guard(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInteractionOperandPrivate); } // OWNED ATTRIBUTES @@ -75,17 +66,15 @@ QList<QUmlInteractionFragment *> QUmlInteractionOperand::fragment() const { // This is a read-write association end - QM_D(const QUmlInteractionOperand); - return d->fragment; + return _fragment; } void QUmlInteractionOperand::addFragment(QUmlInteractionFragment *fragment) { // This is a read-write association end - QM_D(QUmlInteractionOperand); - if (!d->fragment.contains(fragment)) { - d->fragment.append(fragment); + if (!_fragment.contains(fragment)) { + _fragment.append(fragment); } } @@ -93,9 +82,8 @@ void QUmlInteractionOperand::removeFragment(QUmlInteractionFragment *fragment) { // This is a read-write association end - QM_D(QUmlInteractionOperand); - if (d->fragment.contains(fragment)) { - d->fragment.removeAll(fragment); + if (_fragment.contains(fragment)) { + _fragment.removeAll(fragment); } } @@ -106,17 +94,15 @@ QUmlInteractionConstraint *QUmlInteractionOperand::guard() const { // This is a read-write association end - QM_D(const QUmlInteractionOperand); - return d->guard; + return _guard; } void QUmlInteractionOperand::setGuard(QUmlInteractionConstraint *guard) { // This is a read-write association end - QM_D(QUmlInteractionOperand); - if (d->guard != guard) { - d->guard = guard; + if (_guard != guard) { + _guard = guard; } } diff --git a/src/uml/qumlinteractionoperand.h b/src/uml/qumlinteractionoperand.h index 02687a30..ad743434 100644 --- a/src/uml/qumlinteractionoperand.h +++ b/src/uml/qumlinteractionoperand.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlInteractionConstraint; -class QUmlInteractionOperandPrivate; class Q_UML_EXPORT QUmlInteractionOperand : public QUmlInteractionFragment, public QUmlNamespace { public: - QUmlInteractionOperand(bool create_d_ptr = true); + QUmlInteractionOperand(); // Owned attributes QList<QUmlInteractionFragment *> fragment() const; @@ -66,6 +65,10 @@ public: void removeFragment(QUmlInteractionFragment *fragment); QUmlInteractionConstraint *guard() const; void setGuard(QUmlInteractionConstraint *guard); + +protected: + QList<QUmlInteractionFragment *> _fragment; + QUmlInteractionConstraint *_guard; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinteractionoperand_p.h b/src/uml/qumlinteractionoperand_p.h deleted file mode 100644 index 4b244ab7..00000000 --- a/src/uml/qumlinteractionoperand_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERACTIONOPERAND_P_H -#define QUMLINTERACTIONOPERAND_P_H - -#include "QtUml/QUmlInteractionOperand" - -#include "private/qumlinteractionfragment_p.h" -#include "private/qumlnamespace_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInteractionOperandPrivate : public QUmlInteractionFragmentPrivate, public QUmlNamespacePrivate -{ -public: - QUmlInteractionOperandPrivate(); - - QList<QUmlInteractionFragment *> fragment; - QUmlInteractionConstraint *guard; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERACTIONOPERAND_P_H - diff --git a/src/uml/qumlinteractionuse.cpp b/src/uml/qumlinteractionuse.cpp index 8ff0c12b..641bc3b4 100644 --- a/src/uml/qumlinteractionuse.cpp +++ b/src/uml/qumlinteractionuse.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlinteractionuse.h" -#include "qumlinteractionuse_p.h" #include <QtUml/QUmlGate> #include <QtUml/QUmlProperty> @@ -47,13 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlInteractionUsePrivate::QUmlInteractionUsePrivate() : - refersTo(0), - returnValue(0), - returnValueRecipient(0) -{ -} - /*! \class QUmlInteractionUse @@ -62,11 +54,11 @@ QUmlInteractionUsePrivate::QUmlInteractionUsePrivate() : \brief An interaction use refers to an interaction. The interaction use is a shorthand for copying the contents of the referenced interaction where the interaction use is. To be accurate the copying must take into account substituting parameters with arguments and connect the formal gates with the actual ones. */ -QUmlInteractionUse::QUmlInteractionUse(bool create_d_ptr) : - QUmlInteractionFragment(false) +QUmlInteractionUse::QUmlInteractionUse() : + _refersTo(0), + _returnValue(0), + _returnValueRecipient(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInteractionUsePrivate); } // OWNED ATTRIBUTES @@ -78,17 +70,15 @@ QSet<QUmlGate *> QUmlInteractionUse::actualGate() const { // This is a read-write association end - QM_D(const QUmlInteractionUse); - return d->actualGate; + return _actualGate; } void QUmlInteractionUse::addActualGate(QUmlGate *actualGate) { // This is a read-write association end - QM_D(QUmlInteractionUse); - if (!d->actualGate.contains(actualGate)) { - d->actualGate.insert(actualGate); + if (!_actualGate.contains(actualGate)) { + _actualGate.insert(actualGate); } } @@ -96,9 +86,8 @@ void QUmlInteractionUse::removeActualGate(QUmlGate *actualGate) { // This is a read-write association end - QM_D(QUmlInteractionUse); - if (d->actualGate.contains(actualGate)) { - d->actualGate.remove(actualGate); + if (_actualGate.contains(actualGate)) { + _actualGate.remove(actualGate); } } @@ -109,17 +98,15 @@ QList<QUmlValueSpecification *> QUmlInteractionUse::argument() const { // This is a read-write association end - QM_D(const QUmlInteractionUse); - return d->argument; + return _argument; } void QUmlInteractionUse::addArgument(QUmlValueSpecification *argument) { // This is a read-write association end - QM_D(QUmlInteractionUse); - if (!d->argument.contains(argument)) { - d->argument.append(argument); + if (!_argument.contains(argument)) { + _argument.append(argument); } } @@ -127,9 +114,8 @@ void QUmlInteractionUse::removeArgument(QUmlValueSpecification *argument) { // This is a read-write association end - QM_D(QUmlInteractionUse); - if (d->argument.contains(argument)) { - d->argument.removeAll(argument); + if (_argument.contains(argument)) { + _argument.removeAll(argument); } } @@ -140,17 +126,15 @@ QUmlInteraction *QUmlInteractionUse::refersTo() const { // This is a read-write association end - QM_D(const QUmlInteractionUse); - return d->refersTo; + return _refersTo; } void QUmlInteractionUse::setRefersTo(QUmlInteraction *refersTo) { // This is a read-write association end - QM_D(QUmlInteractionUse); - if (d->refersTo != refersTo) { - d->refersTo = refersTo; + if (_refersTo != refersTo) { + _refersTo = refersTo; } } @@ -161,17 +145,15 @@ QUmlValueSpecification *QUmlInteractionUse::returnValue() const { // This is a read-write association end - QM_D(const QUmlInteractionUse); - return d->returnValue; + return _returnValue; } void QUmlInteractionUse::setReturnValue(QUmlValueSpecification *returnValue) { // This is a read-write association end - QM_D(QUmlInteractionUse); - if (d->returnValue != returnValue) { - d->returnValue = returnValue; + if (_returnValue != returnValue) { + _returnValue = returnValue; } } @@ -182,17 +164,15 @@ QUmlProperty *QUmlInteractionUse::returnValueRecipient() const { // This is a read-write association end - QM_D(const QUmlInteractionUse); - return d->returnValueRecipient; + return _returnValueRecipient; } void QUmlInteractionUse::setReturnValueRecipient(QUmlProperty *returnValueRecipient) { // This is a read-write association end - QM_D(QUmlInteractionUse); - if (d->returnValueRecipient != returnValueRecipient) { - d->returnValueRecipient = returnValueRecipient; + if (_returnValueRecipient != returnValueRecipient) { + _returnValueRecipient = returnValueRecipient; } } diff --git a/src/uml/qumlinteractionuse.h b/src/uml/qumlinteractionuse.h index 71d3b8ff..17237f10 100644 --- a/src/uml/qumlinteractionuse.h +++ b/src/uml/qumlinteractionuse.h @@ -55,11 +55,10 @@ class QUmlGate; class QUmlProperty; class QUmlValueSpecification; -class QUmlInteractionUsePrivate; class Q_UML_EXPORT QUmlInteractionUse : public QUmlInteractionFragment { public: - QUmlInteractionUse(bool create_d_ptr = true); + QUmlInteractionUse(); // Owned attributes QSet<QUmlGate *> actualGate() const; @@ -74,6 +73,13 @@ public: void setReturnValue(QUmlValueSpecification *returnValue); QUmlProperty *returnValueRecipient() const; void setReturnValueRecipient(QUmlProperty *returnValueRecipient); + +protected: + QSet<QUmlGate *> _actualGate; + QList<QUmlValueSpecification *> _argument; + QUmlInteraction *_refersTo; + QUmlValueSpecification *_returnValue; + QUmlProperty *_returnValueRecipient; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinteractionuse_p.h b/src/uml/qumlinteractionuse_p.h deleted file mode 100644 index 8092b1be..00000000 --- a/src/uml/qumlinteractionuse_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERACTIONUSE_P_H -#define QUMLINTERACTIONUSE_P_H - -#include "QtUml/QUmlInteractionUse" - -#include "private/qumlinteractionfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInteractionUsePrivate : public QUmlInteractionFragmentPrivate -{ -public: - QUmlInteractionUsePrivate(); - - QSet<QUmlGate *> actualGate; - QList<QUmlValueSpecification *> argument; - QUmlInteraction *refersTo; - QUmlValueSpecification *returnValue; - QUmlProperty *returnValueRecipient; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERACTIONUSE_P_H - diff --git a/src/uml/qumlinterface.cpp b/src/uml/qumlinterface.cpp index 09c739e3..26e5ebcf 100644 --- a/src/uml/qumlinterface.cpp +++ b/src/uml/qumlinterface.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlinterface.h" -#include "qumlinterface_p.h" #include <QtUml/QUmlOperation> #include <QtUml/QUmlProperty> @@ -48,11 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlInterfacePrivate::QUmlInterfacePrivate() : - protocol(0) -{ -} - /*! \class QUmlInterface @@ -61,11 +55,9 @@ QUmlInterfacePrivate::QUmlInterfacePrivate() : \brief Since an interface specifies conformance characteristics, it does not own detailed behavior specifications. Instead, interfaces may own a protocol state machine that specifies event sequences and pre/post conditions for the operations and receptions described by the interface.Interfaces may include receptions (in addition to operations).An interface is a kind of classifier that represents a declaration of a set of coherent public features and obligations. An interface specifies a contract; any instance of a classifier that realizes the interface must fulfill that contract. The obligations that may be associated with an interface are in the form of various kinds of constraints (such as pre- and post-conditions) or protocol specifications, which may impose ordering restrictions on interactions through the interface. */ -QUmlInterface::QUmlInterface(bool create_d_ptr) : - QUmlClassifier(false) +QUmlInterface::QUmlInterface() : + _protocol(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInterfacePrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QList<QUmlClassifier *> QUmlInterface::nestedClassifier() const { // This is a read-write association end - QM_D(const QUmlInterface); - return d->nestedClassifier; + return _nestedClassifier; } void QUmlInterface::addNestedClassifier(QUmlClassifier *nestedClassifier) { // This is a read-write association end - QM_D(QUmlInterface); - if (!d->nestedClassifier.contains(nestedClassifier)) { - d->nestedClassifier.append(nestedClassifier); + if (!_nestedClassifier.contains(nestedClassifier)) { + _nestedClassifier.append(nestedClassifier); } } @@ -95,9 +85,8 @@ void QUmlInterface::removeNestedClassifier(QUmlClassifier *nestedClassifier) { // This is a read-write association end - QM_D(QUmlInterface); - if (d->nestedClassifier.contains(nestedClassifier)) { - d->nestedClassifier.removeAll(nestedClassifier); + if (_nestedClassifier.contains(nestedClassifier)) { + _nestedClassifier.removeAll(nestedClassifier); } } @@ -108,17 +97,15 @@ QList<QUmlProperty *> QUmlInterface::ownedAttribute() const { // This is a read-write association end - QM_D(const QUmlInterface); - return d->ownedAttribute; + return _ownedAttribute; } void QUmlInterface::addOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlInterface); - if (!d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.append(ownedAttribute); + if (!_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.append(ownedAttribute); } } @@ -126,9 +113,8 @@ void QUmlInterface::removeOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlInterface); - if (d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.removeAll(ownedAttribute); + if (_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.removeAll(ownedAttribute); } } @@ -139,17 +125,15 @@ QList<QUmlOperation *> QUmlInterface::ownedOperation() const { // This is a read-write association end - QM_D(const QUmlInterface); - return d->ownedOperation; + return _ownedOperation; } void QUmlInterface::addOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlInterface); - if (!d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.append(ownedOperation); + if (!_ownedOperation.contains(ownedOperation)) { + _ownedOperation.append(ownedOperation); } } @@ -157,9 +141,8 @@ void QUmlInterface::removeOwnedOperation(QUmlOperation *ownedOperation) { // This is a read-write association end - QM_D(QUmlInterface); - if (d->ownedOperation.contains(ownedOperation)) { - d->ownedOperation.removeAll(ownedOperation); + if (_ownedOperation.contains(ownedOperation)) { + _ownedOperation.removeAll(ownedOperation); } } @@ -170,17 +153,15 @@ QSet<QUmlReception *> QUmlInterface::ownedReception() const { // This is a read-write association end - QM_D(const QUmlInterface); - return d->ownedReception; + return _ownedReception; } void QUmlInterface::addOwnedReception(QUmlReception *ownedReception) { // This is a read-write association end - QM_D(QUmlInterface); - if (!d->ownedReception.contains(ownedReception)) { - d->ownedReception.insert(ownedReception); + if (!_ownedReception.contains(ownedReception)) { + _ownedReception.insert(ownedReception); } } @@ -188,9 +169,8 @@ void QUmlInterface::removeOwnedReception(QUmlReception *ownedReception) { // This is a read-write association end - QM_D(QUmlInterface); - if (d->ownedReception.contains(ownedReception)) { - d->ownedReception.remove(ownedReception); + if (_ownedReception.contains(ownedReception)) { + _ownedReception.remove(ownedReception); } } @@ -201,17 +181,15 @@ QUmlProtocolStateMachine *QUmlInterface::protocol() const { // This is a read-write association end - QM_D(const QUmlInterface); - return d->protocol; + return _protocol; } void QUmlInterface::setProtocol(QUmlProtocolStateMachine *protocol) { // This is a read-write association end - QM_D(QUmlInterface); - if (d->protocol != protocol) { - d->protocol = protocol; + if (_protocol != protocol) { + _protocol = protocol; } } @@ -222,17 +200,15 @@ QSet<QUmlInterface *> QUmlInterface::redefinedInterface() const { // This is a read-write association end - QM_D(const QUmlInterface); - return d->redefinedInterface; + return _redefinedInterface; } void QUmlInterface::addRedefinedInterface(QUmlInterface *redefinedInterface) { // This is a read-write association end - QM_D(QUmlInterface); - if (!d->redefinedInterface.contains(redefinedInterface)) { - d->redefinedInterface.insert(redefinedInterface); + if (!_redefinedInterface.contains(redefinedInterface)) { + _redefinedInterface.insert(redefinedInterface); } } @@ -240,9 +216,8 @@ void QUmlInterface::removeRedefinedInterface(QUmlInterface *redefinedInterface) { // This is a read-write association end - QM_D(QUmlInterface); - if (d->redefinedInterface.contains(redefinedInterface)) { - d->redefinedInterface.remove(redefinedInterface); + if (_redefinedInterface.contains(redefinedInterface)) { + _redefinedInterface.remove(redefinedInterface); } } diff --git a/src/uml/qumlinterface.h b/src/uml/qumlinterface.h index 89899e35..c66fffbe 100644 --- a/src/uml/qumlinterface.h +++ b/src/uml/qumlinterface.h @@ -56,11 +56,10 @@ class QUmlProperty; class QUmlProtocolStateMachine; class QUmlReception; -class QUmlInterfacePrivate; class Q_UML_EXPORT QUmlInterface : public QUmlClassifier { public: - QUmlInterface(bool create_d_ptr = true); + QUmlInterface(); // Owned attributes QList<QUmlClassifier *> nestedClassifier() const; @@ -80,6 +79,14 @@ public: QSet<QUmlInterface *> redefinedInterface() const; void addRedefinedInterface(QUmlInterface *redefinedInterface); void removeRedefinedInterface(QUmlInterface *redefinedInterface); + +protected: + QList<QUmlClassifier *> _nestedClassifier; + QList<QUmlProperty *> _ownedAttribute; + QList<QUmlOperation *> _ownedOperation; + QSet<QUmlReception *> _ownedReception; + QUmlProtocolStateMachine *_protocol; + QSet<QUmlInterface *> _redefinedInterface; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinterface_p.h b/src/uml/qumlinterface_p.h deleted file mode 100644 index c3684231..00000000 --- a/src/uml/qumlinterface_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERFACE_P_H -#define QUMLINTERFACE_P_H - -#include "QtUml/QUmlInterface" - -#include "private/qumlclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInterfacePrivate : public QUmlClassifierPrivate -{ -public: - QUmlInterfacePrivate(); - - QList<QUmlClassifier *> nestedClassifier; - QList<QUmlProperty *> ownedAttribute; - QList<QUmlOperation *> ownedOperation; - QSet<QUmlReception *> ownedReception; - QUmlProtocolStateMachine *protocol; - QSet<QUmlInterface *> redefinedInterface; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERFACE_P_H - diff --git a/src/uml/qumlinterfacerealization.cpp b/src/uml/qumlinterfacerealization.cpp index d360d853..8463bf18 100644 --- a/src/uml/qumlinterfacerealization.cpp +++ b/src/uml/qumlinterfacerealization.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlinterfacerealization.h" -#include "qumlinterfacerealization_p.h" #include <QtUml/QUmlBehavioredClassifier> #include <QtUml/QUmlInterface> QT_BEGIN_NAMESPACE -QUmlInterfaceRealizationPrivate::QUmlInterfaceRealizationPrivate() : - contract(0), - implementingClassifier(0) -{ -} - /*! \class QUmlInterfaceRealization @@ -60,11 +53,10 @@ QUmlInterfaceRealizationPrivate::QUmlInterfaceRealizationPrivate() : \brief An interface realization is a specialized realization relationship between a classifier and an interface. This relationship signifies that the realizing classifier conforms to the contract specified by the interface. */ -QUmlInterfaceRealization::QUmlInterfaceRealization(bool create_d_ptr) : - QUmlRealization(false) +QUmlInterfaceRealization::QUmlInterfaceRealization() : + _contract(0), + _implementingClassifier(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInterfaceRealizationPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlInterface *QUmlInterfaceRealization::contract() const { // This is a read-write association end - QM_D(const QUmlInterfaceRealization); - return d->contract; + return _contract; } void QUmlInterfaceRealization::setContract(QUmlInterface *contract) { // This is a read-write association end - QM_D(QUmlInterfaceRealization); - if (d->contract != contract) { - d->contract = contract; + if (_contract != contract) { + _contract = contract; } } @@ -97,17 +87,15 @@ QUmlBehavioredClassifier *QUmlInterfaceRealization::implementingClassifier() con { // This is a read-write association end - QM_D(const QUmlInterfaceRealization); - return d->implementingClassifier; + return _implementingClassifier; } void QUmlInterfaceRealization::setImplementingClassifier(QUmlBehavioredClassifier *implementingClassifier) { // This is a read-write association end - QM_D(QUmlInterfaceRealization); - if (d->implementingClassifier != implementingClassifier) { - d->implementingClassifier = implementingClassifier; + if (_implementingClassifier != implementingClassifier) { + _implementingClassifier = implementingClassifier; } } diff --git a/src/uml/qumlinterfacerealization.h b/src/uml/qumlinterfacerealization.h index f23901c8..d19485e4 100644 --- a/src/uml/qumlinterfacerealization.h +++ b/src/uml/qumlinterfacerealization.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlBehavioredClassifier; class QUmlInterface; -class QUmlInterfaceRealizationPrivate; class Q_UML_EXPORT QUmlInterfaceRealization : public QUmlRealization { public: - QUmlInterfaceRealization(bool create_d_ptr = true); + QUmlInterfaceRealization(); // Owned attributes QUmlInterface *contract() const; void setContract(QUmlInterface *contract); QUmlBehavioredClassifier *implementingClassifier() const; void setImplementingClassifier(QUmlBehavioredClassifier *implementingClassifier); + +protected: + QUmlInterface *_contract; + QUmlBehavioredClassifier *_implementingClassifier; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinterfacerealization_p.h b/src/uml/qumlinterfacerealization_p.h deleted file mode 100644 index e7989d14..00000000 --- a/src/uml/qumlinterfacerealization_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERFACEREALIZATION_P_H -#define QUMLINTERFACEREALIZATION_P_H - -#include "QtUml/QUmlInterfaceRealization" - -#include "private/qumlrealization_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInterfaceRealizationPrivate : public QUmlRealizationPrivate -{ -public: - QUmlInterfaceRealizationPrivate(); - - QUmlInterface *contract; - QUmlBehavioredClassifier *implementingClassifier; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERFACEREALIZATION_P_H - diff --git a/src/uml/qumlinterruptibleactivityregion.cpp b/src/uml/qumlinterruptibleactivityregion.cpp index 8b68eb80..fc5a90e8 100644 --- a/src/uml/qumlinterruptibleactivityregion.cpp +++ b/src/uml/qumlinterruptibleactivityregion.cpp @@ -39,17 +39,12 @@ ** ****************************************************************************/ #include "qumlinterruptibleactivityregion.h" -#include "qumlinterruptibleactivityregion_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityNode> QT_BEGIN_NAMESPACE -QUmlInterruptibleActivityRegionPrivate::QUmlInterruptibleActivityRegionPrivate() -{ -} - /*! \class QUmlInterruptibleActivityRegion @@ -58,11 +53,8 @@ QUmlInterruptibleActivityRegionPrivate::QUmlInterruptibleActivityRegionPrivate() \brief An interruptible activity region is an activity group that supports termination of tokens flowing in the portions of an activity. */ -QUmlInterruptibleActivityRegion::QUmlInterruptibleActivityRegion(bool create_d_ptr) : - QUmlActivityGroup(false) +QUmlInterruptibleActivityRegion::QUmlInterruptibleActivityRegion() { - if (create_d_ptr) - set_d_ptr(new QUmlInterruptibleActivityRegionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QSet<QUmlActivityEdge *> QUmlInterruptibleActivityRegion::interruptingEdge() con { // This is a read-write association end - QM_D(const QUmlInterruptibleActivityRegion); - return d->interruptingEdge; + return _interruptingEdge; } void QUmlInterruptibleActivityRegion::addInterruptingEdge(QUmlActivityEdge *interruptingEdge) { // This is a read-write association end - QM_D(QUmlInterruptibleActivityRegion); - if (!d->interruptingEdge.contains(interruptingEdge)) { - d->interruptingEdge.insert(interruptingEdge); + if (!_interruptingEdge.contains(interruptingEdge)) { + _interruptingEdge.insert(interruptingEdge); } } @@ -92,9 +82,8 @@ void QUmlInterruptibleActivityRegion::removeInterruptingEdge(QUmlActivityEdge *i { // This is a read-write association end - QM_D(QUmlInterruptibleActivityRegion); - if (d->interruptingEdge.contains(interruptingEdge)) { - d->interruptingEdge.remove(interruptingEdge); + if (_interruptingEdge.contains(interruptingEdge)) { + _interruptingEdge.remove(interruptingEdge); } } @@ -105,17 +94,15 @@ QSet<QUmlActivityNode *> QUmlInterruptibleActivityRegion::node() const { // This is a read-write association end - QM_D(const QUmlInterruptibleActivityRegion); - return d->node; + return _node; } void QUmlInterruptibleActivityRegion::addNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlInterruptibleActivityRegion); - if (!d->node.contains(node)) { - d->node.insert(node); + if (!_node.contains(node)) { + _node.insert(node); } } @@ -123,9 +110,8 @@ void QUmlInterruptibleActivityRegion::removeNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlInterruptibleActivityRegion); - if (d->node.contains(node)) { - d->node.remove(node); + if (_node.contains(node)) { + _node.remove(node); } } diff --git a/src/uml/qumlinterruptibleactivityregion.h b/src/uml/qumlinterruptibleactivityregion.h index 0224971b..b22d371d 100644 --- a/src/uml/qumlinterruptibleactivityregion.h +++ b/src/uml/qumlinterruptibleactivityregion.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlActivityEdge; class QUmlActivityNode; -class QUmlInterruptibleActivityRegionPrivate; class Q_UML_EXPORT QUmlInterruptibleActivityRegion : public QUmlActivityGroup { public: - QUmlInterruptibleActivityRegion(bool create_d_ptr = true); + QUmlInterruptibleActivityRegion(); // Owned attributes QSet<QUmlActivityEdge *> interruptingEdge() const; @@ -67,6 +66,10 @@ public: QSet<QUmlActivityNode *> node() const; void addNode(QUmlActivityNode *node); void removeNode(QUmlActivityNode *node); + +protected: + QSet<QUmlActivityEdge *> _interruptingEdge; + QSet<QUmlActivityNode *> _node; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinterruptibleactivityregion_p.h b/src/uml/qumlinterruptibleactivityregion_p.h deleted file mode 100644 index 47c3f443..00000000 --- a/src/uml/qumlinterruptibleactivityregion_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERRUPTIBLEACTIVITYREGION_P_H -#define QUMLINTERRUPTIBLEACTIVITYREGION_P_H - -#include "QtUml/QUmlInterruptibleActivityRegion" - -#include "private/qumlactivitygroup_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInterruptibleActivityRegionPrivate : public QUmlActivityGroupPrivate -{ -public: - QUmlInterruptibleActivityRegionPrivate(); - - QSet<QUmlActivityEdge *> interruptingEdge; - QSet<QUmlActivityNode *> node; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERRUPTIBLEACTIVITYREGION_P_H - diff --git a/src/uml/qumlinterval.cpp b/src/uml/qumlinterval.cpp index 8e601656..bfa6e8ac 100644 --- a/src/uml/qumlinterval.cpp +++ b/src/uml/qumlinterval.cpp @@ -39,16 +39,9 @@ ** ****************************************************************************/ #include "qumlinterval.h" -#include "qumlinterval_p.h" QT_BEGIN_NAMESPACE -QUmlIntervalPrivate::QUmlIntervalPrivate() : - max(0), - min(0) -{ -} - /*! \class QUmlInterval @@ -57,11 +50,10 @@ QUmlIntervalPrivate::QUmlIntervalPrivate() : \brief An interval defines the range between two value specifications. */ -QUmlInterval::QUmlInterval(bool create_d_ptr) : - QUmlValueSpecification(false) +QUmlInterval::QUmlInterval() : + _max(0), + _min(0) { - if (create_d_ptr) - set_d_ptr(new QUmlIntervalPrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QUmlValueSpecification *QUmlInterval::max() const { // This is a read-write association end - QM_D(const QUmlInterval); - return d->max; + return _max; } void QUmlInterval::setMax(QUmlValueSpecification *max) { // This is a read-write association end - QM_D(QUmlInterval); - if (d->max != max) { - d->max = max; + if (_max != max) { + _max = max; } } @@ -94,17 +84,15 @@ QUmlValueSpecification *QUmlInterval::min() const { // This is a read-write association end - QM_D(const QUmlInterval); - return d->min; + return _min; } void QUmlInterval::setMin(QUmlValueSpecification *min) { // This is a read-write association end - QM_D(QUmlInterval); - if (d->min != min) { - d->min = min; + if (_min != min) { + _min = min; } } diff --git a/src/uml/qumlinterval.h b/src/uml/qumlinterval.h index 5b81c4b3..4903b9de 100644 --- a/src/uml/qumlinterval.h +++ b/src/uml/qumlinterval.h @@ -51,17 +51,20 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlIntervalPrivate; class Q_UML_EXPORT QUmlInterval : public QUmlValueSpecification { public: - QUmlInterval(bool create_d_ptr = true); + QUmlInterval(); // Owned attributes QUmlValueSpecification *max() const; void setMax(QUmlValueSpecification *max); QUmlValueSpecification *min() const; void setMin(QUmlValueSpecification *min); + +protected: + QUmlValueSpecification *_max; + QUmlValueSpecification *_min; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinterval_p.h b/src/uml/qumlinterval_p.h deleted file mode 100644 index 92336465..00000000 --- a/src/uml/qumlinterval_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERVAL_P_H -#define QUMLINTERVAL_P_H - -#include "QtUml/QUmlInterval" - -#include "private/qumlvaluespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlIntervalPrivate : public QUmlValueSpecificationPrivate -{ -public: - QUmlIntervalPrivate(); - - QUmlValueSpecification *max; - QUmlValueSpecification *min; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERVAL_P_H - diff --git a/src/uml/qumlintervalconstraint.cpp b/src/uml/qumlintervalconstraint.cpp index 233f2dcf..95333877 100644 --- a/src/uml/qumlintervalconstraint.cpp +++ b/src/uml/qumlintervalconstraint.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlintervalconstraint.h" -#include "qumlintervalconstraint_p.h" #include <QtUml/QUmlInterval> QT_BEGIN_NAMESPACE -QUmlIntervalConstraintPrivate::QUmlIntervalConstraintPrivate() : - specification(0) -{ -} - /*! \class QUmlIntervalConstraint @@ -58,11 +52,9 @@ QUmlIntervalConstraintPrivate::QUmlIntervalConstraintPrivate() : \brief An interval constraint is a constraint that refers to an interval. */ -QUmlIntervalConstraint::QUmlIntervalConstraint(bool create_d_ptr) : - QUmlConstraint(false) +QUmlIntervalConstraint::QUmlIntervalConstraint() : + _specification(0) { - if (create_d_ptr) - set_d_ptr(new QUmlIntervalConstraintPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlInterval *QUmlIntervalConstraint::specification() const { // This is a read-write association end - QM_D(const QUmlIntervalConstraint); - return d->specification; + return _specification; } void QUmlIntervalConstraint::setSpecification(QUmlInterval *specification) { // This is a read-write association end - QM_D(QUmlIntervalConstraint); - if (d->specification != specification) { - d->specification = specification; + if (_specification != specification) { + _specification = specification; } } diff --git a/src/uml/qumlintervalconstraint.h b/src/uml/qumlintervalconstraint.h index efe5b749..7b3e8346 100644 --- a/src/uml/qumlintervalconstraint.h +++ b/src/uml/qumlintervalconstraint.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlInterval; -class QUmlIntervalConstraintPrivate; class Q_UML_EXPORT QUmlIntervalConstraint : public QUmlConstraint { public: - QUmlIntervalConstraint(bool create_d_ptr = true); + QUmlIntervalConstraint(); // Owned attributes QUmlInterval *specification() const; void setSpecification(QUmlInterval *specification); + +protected: + QUmlInterval *_specification; }; QT_END_NAMESPACE diff --git a/src/uml/qumlintervalconstraint_p.h b/src/uml/qumlintervalconstraint_p.h deleted file mode 100644 index 2fafe2b6..00000000 --- a/src/uml/qumlintervalconstraint_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINTERVALCONSTRAINT_P_H -#define QUMLINTERVALCONSTRAINT_P_H - -#include "QtUml/QUmlIntervalConstraint" - -#include "private/qumlconstraint_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlIntervalConstraintPrivate : public QUmlConstraintPrivate -{ -public: - QUmlIntervalConstraintPrivate(); - - QUmlInterval *specification; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINTERVALCONSTRAINT_P_H - diff --git a/src/uml/qumlinvocationaction.cpp b/src/uml/qumlinvocationaction.cpp index aad10af9..e2e96ab3 100644 --- a/src/uml/qumlinvocationaction.cpp +++ b/src/uml/qumlinvocationaction.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlinvocationaction.h" -#include "qumlinvocationaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlPort> QT_BEGIN_NAMESPACE -QUmlInvocationActionPrivate::QUmlInvocationActionPrivate() : - onPort(0) -{ -} - /*! \class QUmlInvocationAction @@ -59,11 +53,9 @@ QUmlInvocationActionPrivate::QUmlInvocationActionPrivate() : \brief InvocationAction is an abstract class for the various actions that invoke behavior.In addition to targeting an object, invocation actions can also invoke behavioral features on ports from where the invocation requests are routed onwards on links deriving from attached connectors. Invocation actions may also be sent to a target via a given port, either on the sending object or on another object. */ -QUmlInvocationAction::QUmlInvocationAction(bool create_d_ptr) : - QUmlAction(false) +QUmlInvocationAction::QUmlInvocationAction() : + _onPort(0) { - if (create_d_ptr) - set_d_ptr(new QUmlInvocationActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QList<QUmlInputPin *> QUmlInvocationAction::argument() const { // This is a read-write association end - QM_D(const QUmlInvocationAction); - return d->argument; + return _argument; } void QUmlInvocationAction::addArgument(QUmlInputPin *argument) { // This is a read-write association end - QM_D(QUmlInvocationAction); - if (!d->argument.contains(argument)) { - d->argument.append(argument); + if (!_argument.contains(argument)) { + _argument.append(argument); } } @@ -93,9 +83,8 @@ void QUmlInvocationAction::removeArgument(QUmlInputPin *argument) { // This is a read-write association end - QM_D(QUmlInvocationAction); - if (d->argument.contains(argument)) { - d->argument.removeAll(argument); + if (_argument.contains(argument)) { + _argument.removeAll(argument); } } @@ -106,17 +95,15 @@ QUmlPort *QUmlInvocationAction::onPort() const { // This is a read-write association end - QM_D(const QUmlInvocationAction); - return d->onPort; + return _onPort; } void QUmlInvocationAction::setOnPort(QUmlPort *onPort) { // This is a read-write association end - QM_D(QUmlInvocationAction); - if (d->onPort != onPort) { - d->onPort = onPort; + if (_onPort != onPort) { + _onPort = onPort; } } diff --git a/src/uml/qumlinvocationaction.h b/src/uml/qumlinvocationaction.h index 8676190e..3b63ecad 100644 --- a/src/uml/qumlinvocationaction.h +++ b/src/uml/qumlinvocationaction.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlPort; -class QUmlInvocationActionPrivate; class Q_UML_EXPORT QUmlInvocationAction : public QUmlAction { public: - Q_DECL_HIDDEN QUmlInvocationAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlInvocationAction(); // Owned attributes QList<QUmlInputPin *> argument() const; @@ -66,6 +65,10 @@ public: void removeArgument(QUmlInputPin *argument); QUmlPort *onPort() const; void setOnPort(QUmlPort *onPort); + +protected: + QList<QUmlInputPin *> _argument; + QUmlPort *_onPort; }; QT_END_NAMESPACE diff --git a/src/uml/qumlinvocationaction_p.h b/src/uml/qumlinvocationaction_p.h deleted file mode 100644 index bb5300f3..00000000 --- a/src/uml/qumlinvocationaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLINVOCATIONACTION_P_H -#define QUMLINVOCATIONACTION_P_H - -#include "QtUml/QUmlInvocationAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlInvocationActionPrivate : public QUmlActionPrivate -{ -public: - QUmlInvocationActionPrivate(); - - QList<QUmlInputPin *> argument; - QUmlPort *onPort; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLINVOCATIONACTION_P_H - diff --git a/src/uml/qumljoinnode.cpp b/src/uml/qumljoinnode.cpp index ba51da67..636f340e 100644 --- a/src/uml/qumljoinnode.cpp +++ b/src/uml/qumljoinnode.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumljoinnode.h" -#include "qumljoinnode_p.h" #include <QtUml/QUmlValueSpecification> QT_BEGIN_NAMESPACE -QUmlJoinNodePrivate::QUmlJoinNodePrivate() : - isCombineDuplicate(true), - joinSpec(0) -{ -} - /*! \class QUmlJoinNode @@ -59,11 +52,10 @@ QUmlJoinNodePrivate::QUmlJoinNodePrivate() : \brief A join node is a control node that synchronizes multiple flows.Join nodes have a Boolean value specification using the names of the incoming edges to specify the conditions under which the join will emit a token. */ -QUmlJoinNode::QUmlJoinNode(bool create_d_ptr) : - QUmlControlNode(false) +QUmlJoinNode::QUmlJoinNode() : + _isCombineDuplicate(true), + _joinSpec(0) { - if (create_d_ptr) - set_d_ptr(new QUmlJoinNodePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ bool QUmlJoinNode::isCombineDuplicate() const { // This is a read-write property - QM_D(const QUmlJoinNode); - return d->isCombineDuplicate; + return _isCombineDuplicate; } void QUmlJoinNode::setCombineDuplicate(bool isCombineDuplicate) { // This is a read-write property - QM_D(QUmlJoinNode); - if (d->isCombineDuplicate != isCombineDuplicate) { - d->isCombineDuplicate = isCombineDuplicate; + if (_isCombineDuplicate != isCombineDuplicate) { + _isCombineDuplicate = isCombineDuplicate; } } @@ -96,17 +86,15 @@ QUmlValueSpecification *QUmlJoinNode::joinSpec() const { // This is a read-write association end - QM_D(const QUmlJoinNode); - return d->joinSpec; + return _joinSpec; } void QUmlJoinNode::setJoinSpec(QUmlValueSpecification *joinSpec) { // This is a read-write association end - QM_D(QUmlJoinNode); - if (d->joinSpec != joinSpec) { - d->joinSpec = joinSpec; + if (_joinSpec != joinSpec) { + _joinSpec = joinSpec; } } diff --git a/src/uml/qumljoinnode.h b/src/uml/qumljoinnode.h index eb42b127..72037695 100644 --- a/src/uml/qumljoinnode.h +++ b/src/uml/qumljoinnode.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlValueSpecification; -class QUmlJoinNodePrivate; class Q_UML_EXPORT QUmlJoinNode : public QUmlControlNode { public: - QUmlJoinNode(bool create_d_ptr = true); + QUmlJoinNode(); // Owned attributes bool isCombineDuplicate() const; void setCombineDuplicate(bool isCombineDuplicate); QUmlValueSpecification *joinSpec() const; void setJoinSpec(QUmlValueSpecification *joinSpec); + +protected: + bool _isCombineDuplicate; + QUmlValueSpecification *_joinSpec; }; QT_END_NAMESPACE diff --git a/src/uml/qumljoinnode_p.h b/src/uml/qumljoinnode_p.h deleted file mode 100644 index 59b04ee5..00000000 --- a/src/uml/qumljoinnode_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLJOINNODE_P_H -#define QUMLJOINNODE_P_H - -#include "QtUml/QUmlJoinNode" - -#include "private/qumlcontrolnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlJoinNodePrivate : public QUmlControlNodePrivate -{ -public: - QUmlJoinNodePrivate(); - - bool isCombineDuplicate; - QUmlValueSpecification *joinSpec; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLJOINNODE_P_H - diff --git a/src/uml/qumllifeline.cpp b/src/uml/qumllifeline.cpp index 80c2e28e..9909cd40 100644 --- a/src/uml/qumllifeline.cpp +++ b/src/uml/qumllifeline.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumllifeline.h" -#include "qumllifeline_p.h" #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlInteraction> @@ -49,14 +48,6 @@ QT_BEGIN_NAMESPACE -QUmlLifelinePrivate::QUmlLifelinePrivate() : - decomposedAs(0), - interaction(0), - represents(0), - selector(0) -{ -} - /*! \class QUmlLifeline @@ -65,11 +56,12 @@ QUmlLifelinePrivate::QUmlLifelinePrivate() : \brief A lifeline represents an individual participant in the interaction. While parts and structural features may have multiplicity greater than 1, lifelines represent only one interacting entity. */ -QUmlLifeline::QUmlLifeline(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlLifeline::QUmlLifeline() : + _decomposedAs(0), + _interaction(0), + _represents(0), + _selector(0) { - if (create_d_ptr) - set_d_ptr(new QUmlLifelinePrivate); } // OWNED ATTRIBUTES @@ -81,17 +73,15 @@ QSet<QUmlInteractionFragment *> QUmlLifeline::coveredBy() const { // This is a read-write association end - QM_D(const QUmlLifeline); - return d->coveredBy; + return _coveredBy; } void QUmlLifeline::addCoveredBy(QUmlInteractionFragment *coveredBy) { // This is a read-write association end - QM_D(QUmlLifeline); - if (!d->coveredBy.contains(coveredBy)) { - d->coveredBy.insert(coveredBy); + if (!_coveredBy.contains(coveredBy)) { + _coveredBy.insert(coveredBy); } } @@ -99,9 +89,8 @@ void QUmlLifeline::removeCoveredBy(QUmlInteractionFragment *coveredBy) { // This is a read-write association end - QM_D(QUmlLifeline); - if (d->coveredBy.contains(coveredBy)) { - d->coveredBy.remove(coveredBy); + if (_coveredBy.contains(coveredBy)) { + _coveredBy.remove(coveredBy); } } @@ -112,17 +101,15 @@ QUmlPartDecomposition *QUmlLifeline::decomposedAs() const { // This is a read-write association end - QM_D(const QUmlLifeline); - return d->decomposedAs; + return _decomposedAs; } void QUmlLifeline::setDecomposedAs(QUmlPartDecomposition *decomposedAs) { // This is a read-write association end - QM_D(QUmlLifeline); - if (d->decomposedAs != decomposedAs) { - d->decomposedAs = decomposedAs; + if (_decomposedAs != decomposedAs) { + _decomposedAs = decomposedAs; } } @@ -133,17 +120,15 @@ QUmlInteraction *QUmlLifeline::interaction() const { // This is a read-write association end - QM_D(const QUmlLifeline); - return d->interaction; + return _interaction; } void QUmlLifeline::setInteraction(QUmlInteraction *interaction) { // This is a read-write association end - QM_D(QUmlLifeline); - if (d->interaction != interaction) { - d->interaction = interaction; + if (_interaction != interaction) { + _interaction = interaction; } } @@ -154,17 +139,15 @@ QUmlConnectableElement *QUmlLifeline::represents() const { // This is a read-write association end - QM_D(const QUmlLifeline); - return d->represents; + return _represents; } void QUmlLifeline::setRepresents(QUmlConnectableElement *represents) { // This is a read-write association end - QM_D(QUmlLifeline); - if (d->represents != represents) { - d->represents = represents; + if (_represents != represents) { + _represents = represents; } } @@ -175,17 +158,15 @@ QUmlValueSpecification *QUmlLifeline::selector() const { // This is a read-write association end - QM_D(const QUmlLifeline); - return d->selector; + return _selector; } void QUmlLifeline::setSelector(QUmlValueSpecification *selector) { // This is a read-write association end - QM_D(QUmlLifeline); - if (d->selector != selector) { - d->selector = selector; + if (_selector != selector) { + _selector = selector; } } diff --git a/src/uml/qumllifeline.h b/src/uml/qumllifeline.h index e6138d01..048f7171 100644 --- a/src/uml/qumllifeline.h +++ b/src/uml/qumllifeline.h @@ -57,11 +57,10 @@ class QUmlInteractionFragment; class QUmlPartDecomposition; class QUmlValueSpecification; -class QUmlLifelinePrivate; class Q_UML_EXPORT QUmlLifeline : public QUmlNamedElement { public: - QUmlLifeline(bool create_d_ptr = true); + QUmlLifeline(); // Owned attributes QSet<QUmlInteractionFragment *> coveredBy() const; @@ -75,6 +74,13 @@ public: void setRepresents(QUmlConnectableElement *represents); QUmlValueSpecification *selector() const; void setSelector(QUmlValueSpecification *selector); + +protected: + QSet<QUmlInteractionFragment *> _coveredBy; + QUmlPartDecomposition *_decomposedAs; + QUmlInteraction *_interaction; + QUmlConnectableElement *_represents; + QUmlValueSpecification *_selector; }; QT_END_NAMESPACE diff --git a/src/uml/qumllifeline_p.h b/src/uml/qumllifeline_p.h deleted file mode 100644 index 1fd507bd..00000000 --- a/src/uml/qumllifeline_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLIFELINE_P_H -#define QUMLLIFELINE_P_H - -#include "QtUml/QUmlLifeline" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLifelinePrivate : public QUmlNamedElementPrivate -{ -public: - QUmlLifelinePrivate(); - - QSet<QUmlInteractionFragment *> coveredBy; - QUmlPartDecomposition *decomposedAs; - QUmlInteraction *interaction; - QUmlConnectableElement *represents; - QUmlValueSpecification *selector; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLIFELINE_P_H - diff --git a/src/uml/qumllinkaction.cpp b/src/uml/qumllinkaction.cpp index ab4c3750..345f9715 100644 --- a/src/uml/qumllinkaction.cpp +++ b/src/uml/qumllinkaction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumllinkaction.h" -#include "qumllinkaction_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlInputPin> @@ -47,10 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlLinkActionPrivate::QUmlLinkActionPrivate() -{ -} - /*! \class QUmlLinkAction @@ -59,11 +54,8 @@ QUmlLinkActionPrivate::QUmlLinkActionPrivate() \brief LinkAction is an abstract class for all link actions that identify their links by the objects at the ends of the links and by the qualifiers at ends of the links. */ -QUmlLinkAction::QUmlLinkAction(bool create_d_ptr) : - QUmlAction(false) +QUmlLinkAction::QUmlLinkAction() { - if (create_d_ptr) - set_d_ptr(new QUmlLinkActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QSet<QUmlLinkEndData *> QUmlLinkAction::endData() const { // This is a read-write association end - QM_D(const QUmlLinkAction); - return d->endData; + return _endData; } void QUmlLinkAction::addEndData(QUmlLinkEndData *endData) { // This is a read-write association end - QM_D(QUmlLinkAction); - if (!d->endData.contains(endData)) { - d->endData.insert(endData); + if (!_endData.contains(endData)) { + _endData.insert(endData); } } @@ -93,9 +83,8 @@ void QUmlLinkAction::removeEndData(QUmlLinkEndData *endData) { // This is a read-write association end - QM_D(QUmlLinkAction); - if (d->endData.contains(endData)) { - d->endData.remove(endData); + if (_endData.contains(endData)) { + _endData.remove(endData); } } @@ -106,17 +95,15 @@ QSet<QUmlInputPin *> QUmlLinkAction::inputValue() const { // This is a read-write association end - QM_D(const QUmlLinkAction); - return d->inputValue; + return _inputValue; } void QUmlLinkAction::addInputValue(QUmlInputPin *inputValue) { // This is a read-write association end - QM_D(QUmlLinkAction); - if (!d->inputValue.contains(inputValue)) { - d->inputValue.insert(inputValue); + if (!_inputValue.contains(inputValue)) { + _inputValue.insert(inputValue); } } @@ -124,9 +111,8 @@ void QUmlLinkAction::removeInputValue(QUmlInputPin *inputValue) { // This is a read-write association end - QM_D(QUmlLinkAction); - if (d->inputValue.contains(inputValue)) { - d->inputValue.remove(inputValue); + if (_inputValue.contains(inputValue)) { + _inputValue.remove(inputValue); } } diff --git a/src/uml/qumllinkaction.h b/src/uml/qumllinkaction.h index 1cd29e70..7c15f390 100644 --- a/src/uml/qumllinkaction.h +++ b/src/uml/qumllinkaction.h @@ -55,11 +55,10 @@ class QUmlAssociation; class QUmlInputPin; class QUmlLinkEndData; -class QUmlLinkActionPrivate; class Q_UML_EXPORT QUmlLinkAction : public QUmlAction { public: - Q_DECL_HIDDEN QUmlLinkAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlLinkAction(); // Owned attributes QSet<QUmlLinkEndData *> endData() const; @@ -71,6 +70,10 @@ public: // Operations QUmlAssociation *association() const; + +protected: + QSet<QUmlLinkEndData *> _endData; + QSet<QUmlInputPin *> _inputValue; }; QT_END_NAMESPACE diff --git a/src/uml/qumllinkaction_p.h b/src/uml/qumllinkaction_p.h deleted file mode 100644 index f0727e9f..00000000 --- a/src/uml/qumllinkaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLINKACTION_P_H -#define QUMLLINKACTION_P_H - -#include "QtUml/QUmlLinkAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLinkActionPrivate : public QUmlActionPrivate -{ -public: - QUmlLinkActionPrivate(); - - QSet<QUmlLinkEndData *> endData; - QSet<QUmlInputPin *> inputValue; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLINKACTION_P_H - diff --git a/src/uml/qumllinkendcreationdata.cpp b/src/uml/qumllinkendcreationdata.cpp index 9387ad39..2ee15e14 100644 --- a/src/uml/qumllinkendcreationdata.cpp +++ b/src/uml/qumllinkendcreationdata.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumllinkendcreationdata.h" -#include "qumllinkendcreationdata_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlLinkEndCreationDataPrivate::QUmlLinkEndCreationDataPrivate() : - insertAt(0), - isReplaceAll(false) -{ -} - /*! \class QUmlLinkEndCreationData @@ -59,11 +52,10 @@ QUmlLinkEndCreationDataPrivate::QUmlLinkEndCreationDataPrivate() : \brief A link end creation data is not an action. It is an element that identifies links. It identifies one end of a link to be created by a create link action. */ -QUmlLinkEndCreationData::QUmlLinkEndCreationData(bool create_d_ptr) : - QUmlLinkEndData(false) +QUmlLinkEndCreationData::QUmlLinkEndCreationData() : + _insertAt(0), + _isReplaceAll(false) { - if (create_d_ptr) - set_d_ptr(new QUmlLinkEndCreationDataPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlInputPin *QUmlLinkEndCreationData::insertAt() const { // This is a read-write association end - QM_D(const QUmlLinkEndCreationData); - return d->insertAt; + return _insertAt; } void QUmlLinkEndCreationData::setInsertAt(QUmlInputPin *insertAt) { // This is a read-write association end - QM_D(QUmlLinkEndCreationData); - if (d->insertAt != insertAt) { - d->insertAt = insertAt; + if (_insertAt != insertAt) { + _insertAt = insertAt; } } @@ -96,17 +86,15 @@ bool QUmlLinkEndCreationData::isReplaceAll() const { // This is a read-write property - QM_D(const QUmlLinkEndCreationData); - return d->isReplaceAll; + return _isReplaceAll; } void QUmlLinkEndCreationData::setReplaceAll(bool isReplaceAll) { // This is a read-write property - QM_D(QUmlLinkEndCreationData); - if (d->isReplaceAll != isReplaceAll) { - d->isReplaceAll = isReplaceAll; + if (_isReplaceAll != isReplaceAll) { + _isReplaceAll = isReplaceAll; } } diff --git a/src/uml/qumllinkendcreationdata.h b/src/uml/qumllinkendcreationdata.h index 9f34a907..9ac422de 100644 --- a/src/uml/qumllinkendcreationdata.h +++ b/src/uml/qumllinkendcreationdata.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlLinkEndCreationDataPrivate; class Q_UML_EXPORT QUmlLinkEndCreationData : public QUmlLinkEndData { public: - QUmlLinkEndCreationData(bool create_d_ptr = true); + QUmlLinkEndCreationData(); // Owned attributes QUmlInputPin *insertAt() const; void setInsertAt(QUmlInputPin *insertAt); bool isReplaceAll() const; void setReplaceAll(bool isReplaceAll); + +protected: + QUmlInputPin *_insertAt; + bool _isReplaceAll; }; QT_END_NAMESPACE diff --git a/src/uml/qumllinkendcreationdata_p.h b/src/uml/qumllinkendcreationdata_p.h deleted file mode 100644 index 4e85e66b..00000000 --- a/src/uml/qumllinkendcreationdata_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLINKENDCREATIONDATA_P_H -#define QUMLLINKENDCREATIONDATA_P_H - -#include "QtUml/QUmlLinkEndCreationData" - -#include "private/qumllinkenddata_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLinkEndCreationDataPrivate : public QUmlLinkEndDataPrivate -{ -public: - QUmlLinkEndCreationDataPrivate(); - - QUmlInputPin *insertAt; - bool isReplaceAll; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLINKENDCREATIONDATA_P_H - diff --git a/src/uml/qumllinkenddata.cpp b/src/uml/qumllinkenddata.cpp index 52c285f3..93e94670 100644 --- a/src/uml/qumllinkenddata.cpp +++ b/src/uml/qumllinkenddata.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumllinkenddata.h" -#include "qumllinkenddata_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlProperty> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlLinkEndDataPrivate::QUmlLinkEndDataPrivate() : - end(0), - value(0) -{ -} - /*! \class QUmlLinkEndData @@ -61,11 +54,10 @@ QUmlLinkEndDataPrivate::QUmlLinkEndDataPrivate() : \brief A link end data is not an action. It is an element that identifies links. It identifies one end of a link to be read or written by the children of a link action. A link cannot be passed as a runtime value to or from an action. Instead, a link is identified by its end objects and qualifier values, if any. This requires more than one piece of data, namely, the statically-specified end in the user model, the object on the end, and the qualifier values for that end, if any. These pieces are brought together around a link end data. Each association end is identified separately with an instance of the LinkEndData class. */ -QUmlLinkEndData::QUmlLinkEndData(bool create_d_ptr) : - QUmlElement(false) +QUmlLinkEndData::QUmlLinkEndData() : + _end(0), + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlLinkEndDataPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlProperty *QUmlLinkEndData::end() const { // This is a read-write association end - QM_D(const QUmlLinkEndData); - return d->end; + return _end; } void QUmlLinkEndData::setEnd(QUmlProperty *end) { // This is a read-write association end - QM_D(QUmlLinkEndData); - if (d->end != end) { - d->end = end; + if (_end != end) { + _end = end; } } @@ -98,17 +88,15 @@ QSet<QUmlQualifierValue *> QUmlLinkEndData::qualifier() const { // This is a read-write association end - QM_D(const QUmlLinkEndData); - return d->qualifier; + return _qualifier; } void QUmlLinkEndData::addQualifier(QUmlQualifierValue *qualifier) { // This is a read-write association end - QM_D(QUmlLinkEndData); - if (!d->qualifier.contains(qualifier)) { - d->qualifier.insert(qualifier); + if (!_qualifier.contains(qualifier)) { + _qualifier.insert(qualifier); } } @@ -116,9 +104,8 @@ void QUmlLinkEndData::removeQualifier(QUmlQualifierValue *qualifier) { // This is a read-write association end - QM_D(QUmlLinkEndData); - if (d->qualifier.contains(qualifier)) { - d->qualifier.remove(qualifier); + if (_qualifier.contains(qualifier)) { + _qualifier.remove(qualifier); } } @@ -129,17 +116,15 @@ QUmlInputPin *QUmlLinkEndData::value() const { // This is a read-write association end - QM_D(const QUmlLinkEndData); - return d->value; + return _value; } void QUmlLinkEndData::setValue(QUmlInputPin *value) { // This is a read-write association end - QM_D(QUmlLinkEndData); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumllinkenddata.h b/src/uml/qumllinkenddata.h index a4df4457..6f733714 100644 --- a/src/uml/qumllinkenddata.h +++ b/src/uml/qumllinkenddata.h @@ -55,11 +55,10 @@ class QUmlInputPin; class QUmlProperty; class QUmlQualifierValue; -class QUmlLinkEndDataPrivate; class Q_UML_EXPORT QUmlLinkEndData : public QUmlElement { public: - QUmlLinkEndData(bool create_d_ptr = true); + QUmlLinkEndData(); // Owned attributes QUmlProperty *end() const; @@ -69,6 +68,11 @@ public: void removeQualifier(QUmlQualifierValue *qualifier); QUmlInputPin *value() const; void setValue(QUmlInputPin *value); + +protected: + QUmlProperty *_end; + QSet<QUmlQualifierValue *> _qualifier; + QUmlInputPin *_value; }; QT_END_NAMESPACE diff --git a/src/uml/qumllinkenddata_p.h b/src/uml/qumllinkenddata_p.h deleted file mode 100644 index c3826221..00000000 --- a/src/uml/qumllinkenddata_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLINKENDDATA_P_H -#define QUMLLINKENDDATA_P_H - -#include "QtUml/QUmlLinkEndData" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLinkEndDataPrivate : public QUmlElementPrivate -{ -public: - QUmlLinkEndDataPrivate(); - - QUmlProperty *end; - QSet<QUmlQualifierValue *> qualifier; - QUmlInputPin *value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLINKENDDATA_P_H - diff --git a/src/uml/qumllinkenddestructiondata.cpp b/src/uml/qumllinkenddestructiondata.cpp index 6475595a..72239f71 100644 --- a/src/uml/qumllinkenddestructiondata.cpp +++ b/src/uml/qumllinkenddestructiondata.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumllinkenddestructiondata.h" -#include "qumllinkenddestructiondata_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlLinkEndDestructionDataPrivate::QUmlLinkEndDestructionDataPrivate() : - destroyAt(0), - isDestroyDuplicates(false) -{ -} - /*! \class QUmlLinkEndDestructionData @@ -59,11 +52,10 @@ QUmlLinkEndDestructionDataPrivate::QUmlLinkEndDestructionDataPrivate() : \brief A link end destruction data is not an action. It is an element that identifies links. It identifies one end of a link to be destroyed by destroy link action. */ -QUmlLinkEndDestructionData::QUmlLinkEndDestructionData(bool create_d_ptr) : - QUmlLinkEndData(false) +QUmlLinkEndDestructionData::QUmlLinkEndDestructionData() : + _destroyAt(0), + _isDestroyDuplicates(false) { - if (create_d_ptr) - set_d_ptr(new QUmlLinkEndDestructionDataPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlInputPin *QUmlLinkEndDestructionData::destroyAt() const { // This is a read-write association end - QM_D(const QUmlLinkEndDestructionData); - return d->destroyAt; + return _destroyAt; } void QUmlLinkEndDestructionData::setDestroyAt(QUmlInputPin *destroyAt) { // This is a read-write association end - QM_D(QUmlLinkEndDestructionData); - if (d->destroyAt != destroyAt) { - d->destroyAt = destroyAt; + if (_destroyAt != destroyAt) { + _destroyAt = destroyAt; } } @@ -96,17 +86,15 @@ bool QUmlLinkEndDestructionData::isDestroyDuplicates() const { // This is a read-write property - QM_D(const QUmlLinkEndDestructionData); - return d->isDestroyDuplicates; + return _isDestroyDuplicates; } void QUmlLinkEndDestructionData::setDestroyDuplicates(bool isDestroyDuplicates) { // This is a read-write property - QM_D(QUmlLinkEndDestructionData); - if (d->isDestroyDuplicates != isDestroyDuplicates) { - d->isDestroyDuplicates = isDestroyDuplicates; + if (_isDestroyDuplicates != isDestroyDuplicates) { + _isDestroyDuplicates = isDestroyDuplicates; } } diff --git a/src/uml/qumllinkenddestructiondata.h b/src/uml/qumllinkenddestructiondata.h index e36e6b82..84dd6b69 100644 --- a/src/uml/qumllinkenddestructiondata.h +++ b/src/uml/qumllinkenddestructiondata.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlLinkEndDestructionDataPrivate; class Q_UML_EXPORT QUmlLinkEndDestructionData : public QUmlLinkEndData { public: - QUmlLinkEndDestructionData(bool create_d_ptr = true); + QUmlLinkEndDestructionData(); // Owned attributes QUmlInputPin *destroyAt() const; void setDestroyAt(QUmlInputPin *destroyAt); bool isDestroyDuplicates() const; void setDestroyDuplicates(bool isDestroyDuplicates); + +protected: + QUmlInputPin *_destroyAt; + bool _isDestroyDuplicates; }; QT_END_NAMESPACE diff --git a/src/uml/qumllinkenddestructiondata_p.h b/src/uml/qumllinkenddestructiondata_p.h deleted file mode 100644 index bae4a6ab..00000000 --- a/src/uml/qumllinkenddestructiondata_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLINKENDDESTRUCTIONDATA_P_H -#define QUMLLINKENDDESTRUCTIONDATA_P_H - -#include "QtUml/QUmlLinkEndDestructionData" - -#include "private/qumllinkenddata_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLinkEndDestructionDataPrivate : public QUmlLinkEndDataPrivate -{ -public: - QUmlLinkEndDestructionDataPrivate(); - - QUmlInputPin *destroyAt; - bool isDestroyDuplicates; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLINKENDDESTRUCTIONDATA_P_H - diff --git a/src/uml/qumlliteralboolean.cpp b/src/uml/qumlliteralboolean.cpp index 4c32f130..97230fea 100644 --- a/src/uml/qumlliteralboolean.cpp +++ b/src/uml/qumlliteralboolean.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlliteralboolean.h" -#include "qumlliteralboolean_p.h" QT_BEGIN_NAMESPACE -QUmlLiteralBooleanPrivate::QUmlLiteralBooleanPrivate() : - value(false) -{ -} - /*! \class QUmlLiteralBoolean @@ -56,11 +50,9 @@ QUmlLiteralBooleanPrivate::QUmlLiteralBooleanPrivate() : \brief A literal Boolean is a specification of a Boolean value. */ -QUmlLiteralBoolean::QUmlLiteralBoolean(bool create_d_ptr) : - QUmlLiteralSpecification(false) +QUmlLiteralBoolean::QUmlLiteralBoolean() : + _value(false) { - if (create_d_ptr) - set_d_ptr(new QUmlLiteralBooleanPrivate); } // OWNED ATTRIBUTES @@ -72,17 +64,15 @@ bool QUmlLiteralBoolean::value() const { // This is a read-write property - QM_D(const QUmlLiteralBoolean); - return d->value; + return _value; } void QUmlLiteralBoolean::setValue(bool value) { // This is a read-write property - QM_D(QUmlLiteralBoolean); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlliteralboolean.h b/src/uml/qumlliteralboolean.h index 2ad555f4..6fbcb0e7 100644 --- a/src/uml/qumlliteralboolean.h +++ b/src/uml/qumlliteralboolean.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlLiteralBooleanPrivate; class Q_UML_EXPORT QUmlLiteralBoolean : public QUmlLiteralSpecification { public: - QUmlLiteralBoolean(bool create_d_ptr = true); + QUmlLiteralBoolean(); // Owned attributes bool value() const; @@ -64,6 +63,9 @@ public: // Operations bool booleanValue() const; bool isComputable() const; + +protected: + bool _value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlliteralboolean_p.h b/src/uml/qumlliteralboolean_p.h deleted file mode 100644 index 250419be..00000000 --- a/src/uml/qumlliteralboolean_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLITERALBOOLEAN_P_H -#define QUMLLITERALBOOLEAN_P_H - -#include "QtUml/QUmlLiteralBoolean" - -#include "private/qumlliteralspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLiteralBooleanPrivate : public QUmlLiteralSpecificationPrivate -{ -public: - QUmlLiteralBooleanPrivate(); - - bool value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLITERALBOOLEAN_P_H - diff --git a/src/uml/qumlliteralinteger.cpp b/src/uml/qumlliteralinteger.cpp index 28f71ebf..71bb6a2e 100644 --- a/src/uml/qumlliteralinteger.cpp +++ b/src/uml/qumlliteralinteger.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlliteralinteger.h" -#include "qumlliteralinteger_p.h" QT_BEGIN_NAMESPACE -QUmlLiteralIntegerPrivate::QUmlLiteralIntegerPrivate() : - value(0) -{ -} - /*! \class QUmlLiteralInteger @@ -56,11 +50,9 @@ QUmlLiteralIntegerPrivate::QUmlLiteralIntegerPrivate() : \brief A literal integer is a specification of an integer value. */ -QUmlLiteralInteger::QUmlLiteralInteger(bool create_d_ptr) : - QUmlLiteralSpecification(false) +QUmlLiteralInteger::QUmlLiteralInteger() : + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlLiteralIntegerPrivate); } // OWNED ATTRIBUTES @@ -72,17 +64,15 @@ int QUmlLiteralInteger::value() const { // This is a read-write property - QM_D(const QUmlLiteralInteger); - return d->value; + return _value; } void QUmlLiteralInteger::setValue(int value) { // This is a read-write property - QM_D(QUmlLiteralInteger); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlliteralinteger.h b/src/uml/qumlliteralinteger.h index 08dfad28..ad640dec 100644 --- a/src/uml/qumlliteralinteger.h +++ b/src/uml/qumlliteralinteger.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlLiteralIntegerPrivate; class Q_UML_EXPORT QUmlLiteralInteger : public QUmlLiteralSpecification { public: - QUmlLiteralInteger(bool create_d_ptr = true); + QUmlLiteralInteger(); // Owned attributes int value() const; @@ -64,6 +63,9 @@ public: // Operations int integerValue() const; bool isComputable() const; + +protected: + int _value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlliteralinteger_p.h b/src/uml/qumlliteralinteger_p.h deleted file mode 100644 index 52fab7b7..00000000 --- a/src/uml/qumlliteralinteger_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLITERALINTEGER_P_H -#define QUMLLITERALINTEGER_P_H - -#include "QtUml/QUmlLiteralInteger" - -#include "private/qumlliteralspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLiteralIntegerPrivate : public QUmlLiteralSpecificationPrivate -{ -public: - QUmlLiteralIntegerPrivate(); - - int value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLITERALINTEGER_P_H - diff --git a/src/uml/qumlliteralnull.cpp b/src/uml/qumlliteralnull.cpp index 4daff07a..577865af 100644 --- a/src/uml/qumlliteralnull.cpp +++ b/src/uml/qumlliteralnull.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlliteralnull.h" -#include "qumlliteralnull_p.h" QT_BEGIN_NAMESPACE -QUmlLiteralNullPrivate::QUmlLiteralNullPrivate() -{ -} - /*! \class QUmlLiteralNull @@ -55,11 +50,8 @@ QUmlLiteralNullPrivate::QUmlLiteralNullPrivate() \brief A literal null specifies the lack of a value. */ -QUmlLiteralNull::QUmlLiteralNull(bool create_d_ptr) : - QUmlLiteralSpecification(false) +QUmlLiteralNull::QUmlLiteralNull() { - if (create_d_ptr) - set_d_ptr(new QUmlLiteralNullPrivate); } // OPERATIONS diff --git a/src/uml/qumlliteralnull.h b/src/uml/qumlliteralnull.h index 37c65ef8..7e2e1326 100644 --- a/src/uml/qumlliteralnull.h +++ b/src/uml/qumlliteralnull.h @@ -51,15 +51,16 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlLiteralNullPrivate; class Q_UML_EXPORT QUmlLiteralNull : public QUmlLiteralSpecification { public: - QUmlLiteralNull(bool create_d_ptr = true); + QUmlLiteralNull(); // Operations bool isComputable() const; bool isNull() const; + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlliteralnull_p.h b/src/uml/qumlliteralnull_p.h deleted file mode 100644 index fc7d50c7..00000000 --- a/src/uml/qumlliteralnull_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLITERALNULL_P_H -#define QUMLLITERALNULL_P_H - -#include "QtUml/QUmlLiteralNull" - -#include "private/qumlliteralspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLiteralNullPrivate : public QUmlLiteralSpecificationPrivate -{ -public: - QUmlLiteralNullPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLITERALNULL_P_H - diff --git a/src/uml/qumlliteralreal.cpp b/src/uml/qumlliteralreal.cpp index eb3ad06f..ad292c87 100644 --- a/src/uml/qumlliteralreal.cpp +++ b/src/uml/qumlliteralreal.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlliteralreal.h" -#include "qumlliteralreal_p.h" QT_BEGIN_NAMESPACE -QUmlLiteralRealPrivate::QUmlLiteralRealPrivate() -{ -} - /*! \class QUmlLiteralReal @@ -55,11 +50,8 @@ QUmlLiteralRealPrivate::QUmlLiteralRealPrivate() \brief A literal real is a specification of a real value. */ -QUmlLiteralReal::QUmlLiteralReal(bool create_d_ptr) : - QUmlLiteralSpecification(false) +QUmlLiteralReal::QUmlLiteralReal() { - if (create_d_ptr) - set_d_ptr(new QUmlLiteralRealPrivate); } // OWNED ATTRIBUTES @@ -68,17 +60,15 @@ double QUmlLiteralReal::value() const { // This is a read-write property - QM_D(const QUmlLiteralReal); - return d->value; + return _value; } void QUmlLiteralReal::setValue(double value) { // This is a read-write property - QM_D(QUmlLiteralReal); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlliteralreal.h b/src/uml/qumlliteralreal.h index c3d14f3f..9ebbd6c9 100644 --- a/src/uml/qumlliteralreal.h +++ b/src/uml/qumlliteralreal.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlLiteralRealPrivate; class Q_UML_EXPORT QUmlLiteralReal : public QUmlLiteralSpecification { public: - QUmlLiteralReal(bool create_d_ptr = true); + QUmlLiteralReal(); // Owned attributes double value() const; @@ -64,6 +63,9 @@ public: // Operations bool isComputable() const; double realValue() const; + +protected: + double _value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlliteralreal_p.h b/src/uml/qumlliteralreal_p.h deleted file mode 100644 index 3738ce45..00000000 --- a/src/uml/qumlliteralreal_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLITERALREAL_P_H -#define QUMLLITERALREAL_P_H - -#include "QtUml/QUmlLiteralReal" - -#include "private/qumlliteralspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLiteralRealPrivate : public QUmlLiteralSpecificationPrivate -{ -public: - QUmlLiteralRealPrivate(); - - double value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLITERALREAL_P_H - diff --git a/src/uml/qumlliteralspecification.cpp b/src/uml/qumlliteralspecification.cpp index 95d998e8..bc644837 100644 --- a/src/uml/qumlliteralspecification.cpp +++ b/src/uml/qumlliteralspecification.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlliteralspecification.h" -#include "qumlliteralspecification_p.h" QT_BEGIN_NAMESPACE -QUmlLiteralSpecificationPrivate::QUmlLiteralSpecificationPrivate() -{ -} - /*! \class QUmlLiteralSpecification @@ -55,11 +50,8 @@ QUmlLiteralSpecificationPrivate::QUmlLiteralSpecificationPrivate() \brief A literal specification identifies a literal constant being modeled. */ -QUmlLiteralSpecification::QUmlLiteralSpecification(bool create_d_ptr) : - QUmlValueSpecification(false) +QUmlLiteralSpecification::QUmlLiteralSpecification() { - if (create_d_ptr) - set_d_ptr(new QUmlLiteralSpecificationPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlliteralspecification.h b/src/uml/qumlliteralspecification.h index a32793b8..839d9ed5 100644 --- a/src/uml/qumlliteralspecification.h +++ b/src/uml/qumlliteralspecification.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlLiteralSpecificationPrivate; class Q_UML_EXPORT QUmlLiteralSpecification : public QUmlValueSpecification { public: - Q_DECL_HIDDEN QUmlLiteralSpecification(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlLiteralSpecification(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlliteralspecification_p.h b/src/uml/qumlliteralspecification_p.h deleted file mode 100644 index ebd5529b..00000000 --- a/src/uml/qumlliteralspecification_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLITERALSPECIFICATION_P_H -#define QUMLLITERALSPECIFICATION_P_H - -#include "QtUml/QUmlLiteralSpecification" - -#include "private/qumlvaluespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLiteralSpecificationPrivate : public QUmlValueSpecificationPrivate -{ -public: - QUmlLiteralSpecificationPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLITERALSPECIFICATION_P_H - diff --git a/src/uml/qumlliteralstring.cpp b/src/uml/qumlliteralstring.cpp index 361b8b2d..792c6ab2 100644 --- a/src/uml/qumlliteralstring.cpp +++ b/src/uml/qumlliteralstring.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlliteralstring.h" -#include "qumlliteralstring_p.h" QT_BEGIN_NAMESPACE -QUmlLiteralStringPrivate::QUmlLiteralStringPrivate() -{ -} - /*! \class QUmlLiteralString @@ -55,11 +50,8 @@ QUmlLiteralStringPrivate::QUmlLiteralStringPrivate() \brief A literal string is a specification of a string value. */ -QUmlLiteralString::QUmlLiteralString(bool create_d_ptr) : - QUmlLiteralSpecification(false) +QUmlLiteralString::QUmlLiteralString() { - if (create_d_ptr) - set_d_ptr(new QUmlLiteralStringPrivate); } // OWNED ATTRIBUTES @@ -71,17 +63,15 @@ QString QUmlLiteralString::value() const { // This is a read-write property - QM_D(const QUmlLiteralString); - return d->value; + return _value; } void QUmlLiteralString::setValue(QString value) { // This is a read-write property - QM_D(QUmlLiteralString); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlliteralstring.h b/src/uml/qumlliteralstring.h index dd29dffe..facb7b45 100644 --- a/src/uml/qumlliteralstring.h +++ b/src/uml/qumlliteralstring.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlLiteralStringPrivate; class Q_UML_EXPORT QUmlLiteralString : public QUmlLiteralSpecification { public: - QUmlLiteralString(bool create_d_ptr = true); + QUmlLiteralString(); // Owned attributes QString value() const; @@ -64,6 +63,9 @@ public: // Operations bool isComputable() const; QString stringValue() const; + +protected: + QString _value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlliteralstring_p.h b/src/uml/qumlliteralstring_p.h deleted file mode 100644 index 02b7b4cc..00000000 --- a/src/uml/qumlliteralstring_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLITERALSTRING_P_H -#define QUMLLITERALSTRING_P_H - -#include "QtUml/QUmlLiteralString" - -#include "private/qumlliteralspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLiteralStringPrivate : public QUmlLiteralSpecificationPrivate -{ -public: - QUmlLiteralStringPrivate(); - - QString value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLITERALSTRING_P_H - diff --git a/src/uml/qumlliteralunlimitednatural.cpp b/src/uml/qumlliteralunlimitednatural.cpp index c0a677ed..e9f85ac5 100644 --- a/src/uml/qumlliteralunlimitednatural.cpp +++ b/src/uml/qumlliteralunlimitednatural.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlliteralunlimitednatural.h" -#include "qumlliteralunlimitednatural_p.h" QT_BEGIN_NAMESPACE -QUmlLiteralUnlimitedNaturalPrivate::QUmlLiteralUnlimitedNaturalPrivate() : - value(0) -{ -} - /*! \class QUmlLiteralUnlimitedNatural @@ -56,11 +50,9 @@ QUmlLiteralUnlimitedNaturalPrivate::QUmlLiteralUnlimitedNaturalPrivate() : \brief A literal unlimited natural is a specification of an unlimited natural number. */ -QUmlLiteralUnlimitedNatural::QUmlLiteralUnlimitedNatural(bool create_d_ptr) : - QUmlLiteralSpecification(false) +QUmlLiteralUnlimitedNatural::QUmlLiteralUnlimitedNatural() : + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlLiteralUnlimitedNaturalPrivate); } // OWNED ATTRIBUTES @@ -72,17 +64,15 @@ int QUmlLiteralUnlimitedNatural::value() const { // This is a read-write property - QM_D(const QUmlLiteralUnlimitedNatural); - return d->value; + return _value; } void QUmlLiteralUnlimitedNatural::setValue(int value) { // This is a read-write property - QM_D(QUmlLiteralUnlimitedNatural); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlliteralunlimitednatural.h b/src/uml/qumlliteralunlimitednatural.h index d66994ef..4c6669e6 100644 --- a/src/uml/qumlliteralunlimitednatural.h +++ b/src/uml/qumlliteralunlimitednatural.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlLiteralUnlimitedNaturalPrivate; class Q_UML_EXPORT QUmlLiteralUnlimitedNatural : public QUmlLiteralSpecification { public: - QUmlLiteralUnlimitedNatural(bool create_d_ptr = true); + QUmlLiteralUnlimitedNatural(); // Owned attributes int value() const; @@ -64,6 +63,9 @@ public: // Operations bool isComputable() const; int unlimitedValue() const; + +protected: + int _value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlliteralunlimitednatural_p.h b/src/uml/qumlliteralunlimitednatural_p.h deleted file mode 100644 index b2072812..00000000 --- a/src/uml/qumlliteralunlimitednatural_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLITERALUNLIMITEDNATURAL_P_H -#define QUMLLITERALUNLIMITEDNATURAL_P_H - -#include "QtUml/QUmlLiteralUnlimitedNatural" - -#include "private/qumlliteralspecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLiteralUnlimitedNaturalPrivate : public QUmlLiteralSpecificationPrivate -{ -public: - QUmlLiteralUnlimitedNaturalPrivate(); - - int value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLITERALUNLIMITEDNATURAL_P_H - diff --git a/src/uml/qumlloopnode.cpp b/src/uml/qumlloopnode.cpp index cdf8fe07..dfa9e486 100644 --- a/src/uml/qumlloopnode.cpp +++ b/src/uml/qumlloopnode.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlloopnode.h" -#include "qumlloopnode_p.h" #include <QtUml/QUmlExecutableNode> #include <QtUml/QUmlInputPin> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlLoopNodePrivate::QUmlLoopNodePrivate() : - decider(0), - isTestedFirst(false) -{ -} - /*! \class QUmlLoopNode @@ -61,11 +54,10 @@ QUmlLoopNodePrivate::QUmlLoopNodePrivate() : \brief A loop node is a structured activity node that represents a loop with setup, test, and body sections. */ -QUmlLoopNode::QUmlLoopNode(bool create_d_ptr) : - QUmlStructuredActivityNode(false) +QUmlLoopNode::QUmlLoopNode() : + _decider(0), + _isTestedFirst(false) { - if (create_d_ptr) - set_d_ptr(new QUmlLoopNodePrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QList<QUmlOutputPin *> QUmlLoopNode::bodyOutput() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->bodyOutput; + return _bodyOutput; } void QUmlLoopNode::addBodyOutput(QUmlOutputPin *bodyOutput) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (!d->bodyOutput.contains(bodyOutput)) { - d->bodyOutput.append(bodyOutput); + if (!_bodyOutput.contains(bodyOutput)) { + _bodyOutput.append(bodyOutput); } } @@ -95,9 +85,8 @@ void QUmlLoopNode::removeBodyOutput(QUmlOutputPin *bodyOutput) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->bodyOutput.contains(bodyOutput)) { - d->bodyOutput.removeAll(bodyOutput); + if (_bodyOutput.contains(bodyOutput)) { + _bodyOutput.removeAll(bodyOutput); } } @@ -108,17 +97,15 @@ QSet<QUmlExecutableNode *> QUmlLoopNode::bodyPart() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->bodyPart; + return _bodyPart; } void QUmlLoopNode::addBodyPart(QUmlExecutableNode *bodyPart) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (!d->bodyPart.contains(bodyPart)) { - d->bodyPart.insert(bodyPart); + if (!_bodyPart.contains(bodyPart)) { + _bodyPart.insert(bodyPart); } } @@ -126,9 +113,8 @@ void QUmlLoopNode::removeBodyPart(QUmlExecutableNode *bodyPart) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->bodyPart.contains(bodyPart)) { - d->bodyPart.remove(bodyPart); + if (_bodyPart.contains(bodyPart)) { + _bodyPart.remove(bodyPart); } } @@ -139,17 +125,15 @@ QUmlOutputPin *QUmlLoopNode::decider() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->decider; + return _decider; } void QUmlLoopNode::setDecider(QUmlOutputPin *decider) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->decider != decider) { - d->decider = decider; + if (_decider != decider) { + _decider = decider; } } @@ -160,17 +144,15 @@ bool QUmlLoopNode::isTestedFirst() const { // This is a read-write property - QM_D(const QUmlLoopNode); - return d->isTestedFirst; + return _isTestedFirst; } void QUmlLoopNode::setTestedFirst(bool isTestedFirst) { // This is a read-write property - QM_D(QUmlLoopNode); - if (d->isTestedFirst != isTestedFirst) { - d->isTestedFirst = isTestedFirst; + if (_isTestedFirst != isTestedFirst) { + _isTestedFirst = isTestedFirst; } } @@ -181,17 +163,15 @@ QList<QUmlOutputPin *> QUmlLoopNode::loopVariable() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->loopVariable; + return _loopVariable; } void QUmlLoopNode::addLoopVariable(QUmlOutputPin *loopVariable) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (!d->loopVariable.contains(loopVariable)) { - d->loopVariable.append(loopVariable); + if (!_loopVariable.contains(loopVariable)) { + _loopVariable.append(loopVariable); } } @@ -199,9 +179,8 @@ void QUmlLoopNode::removeLoopVariable(QUmlOutputPin *loopVariable) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->loopVariable.contains(loopVariable)) { - d->loopVariable.removeAll(loopVariable); + if (_loopVariable.contains(loopVariable)) { + _loopVariable.removeAll(loopVariable); } } @@ -212,17 +191,15 @@ QList<QUmlInputPin *> QUmlLoopNode::loopVariableInput() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->loopVariableInput; + return _loopVariableInput; } void QUmlLoopNode::addLoopVariableInput(QUmlInputPin *loopVariableInput) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (!d->loopVariableInput.contains(loopVariableInput)) { - d->loopVariableInput.append(loopVariableInput); + if (!_loopVariableInput.contains(loopVariableInput)) { + _loopVariableInput.append(loopVariableInput); } } @@ -230,9 +207,8 @@ void QUmlLoopNode::removeLoopVariableInput(QUmlInputPin *loopVariableInput) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->loopVariableInput.contains(loopVariableInput)) { - d->loopVariableInput.removeAll(loopVariableInput); + if (_loopVariableInput.contains(loopVariableInput)) { + _loopVariableInput.removeAll(loopVariableInput); } } @@ -243,17 +219,15 @@ QList<QUmlOutputPin *> QUmlLoopNode::result() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->result; + return _result; } void QUmlLoopNode::addResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (!d->result.contains(result)) { - d->result.append(result); + if (!_result.contains(result)) { + _result.append(result); } } @@ -261,9 +235,8 @@ void QUmlLoopNode::removeResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->result.contains(result)) { - d->result.removeAll(result); + if (_result.contains(result)) { + _result.removeAll(result); } } @@ -274,17 +247,15 @@ QSet<QUmlExecutableNode *> QUmlLoopNode::setupPart() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->setupPart; + return _setupPart; } void QUmlLoopNode::addSetupPart(QUmlExecutableNode *setupPart) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (!d->setupPart.contains(setupPart)) { - d->setupPart.insert(setupPart); + if (!_setupPart.contains(setupPart)) { + _setupPart.insert(setupPart); } } @@ -292,9 +263,8 @@ void QUmlLoopNode::removeSetupPart(QUmlExecutableNode *setupPart) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->setupPart.contains(setupPart)) { - d->setupPart.remove(setupPart); + if (_setupPart.contains(setupPart)) { + _setupPart.remove(setupPart); } } @@ -305,17 +275,15 @@ QSet<QUmlExecutableNode *> QUmlLoopNode::test() const { // This is a read-write association end - QM_D(const QUmlLoopNode); - return d->test; + return _test; } void QUmlLoopNode::addTest(QUmlExecutableNode *test) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (!d->test.contains(test)) { - d->test.insert(test); + if (!_test.contains(test)) { + _test.insert(test); } } @@ -323,9 +291,8 @@ void QUmlLoopNode::removeTest(QUmlExecutableNode *test) { // This is a read-write association end - QM_D(QUmlLoopNode); - if (d->test.contains(test)) { - d->test.remove(test); + if (_test.contains(test)) { + _test.remove(test); } } diff --git a/src/uml/qumlloopnode.h b/src/uml/qumlloopnode.h index 7e746e30..e9378886 100644 --- a/src/uml/qumlloopnode.h +++ b/src/uml/qumlloopnode.h @@ -55,11 +55,10 @@ class QUmlExecutableNode; class QUmlInputPin; class QUmlOutputPin; -class QUmlLoopNodePrivate; class Q_UML_EXPORT QUmlLoopNode : public QUmlStructuredActivityNode { public: - QUmlLoopNode(bool create_d_ptr = true); + QUmlLoopNode(); // Owned attributes QList<QUmlOutputPin *> bodyOutput() const; @@ -87,6 +86,17 @@ public: QSet<QUmlExecutableNode *> test() const; void addTest(QUmlExecutableNode *test); void removeTest(QUmlExecutableNode *test); + +protected: + QList<QUmlOutputPin *> _bodyOutput; + QSet<QUmlExecutableNode *> _bodyPart; + QUmlOutputPin *_decider; + bool _isTestedFirst; + QList<QUmlOutputPin *> _loopVariable; + QList<QUmlInputPin *> _loopVariableInput; + QList<QUmlOutputPin *> _result; + QSet<QUmlExecutableNode *> _setupPart; + QSet<QUmlExecutableNode *> _test; }; QT_END_NAMESPACE diff --git a/src/uml/qumlloopnode_p.h b/src/uml/qumlloopnode_p.h deleted file mode 100644 index 9523cc70..00000000 --- a/src/uml/qumlloopnode_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLLOOPNODE_P_H -#define QUMLLOOPNODE_P_H - -#include "QtUml/QUmlLoopNode" - -#include "private/qumlstructuredactivitynode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlLoopNodePrivate : public QUmlStructuredActivityNodePrivate -{ -public: - QUmlLoopNodePrivate(); - - QList<QUmlOutputPin *> bodyOutput; - QSet<QUmlExecutableNode *> bodyPart; - QUmlOutputPin *decider; - bool isTestedFirst; - QList<QUmlOutputPin *> loopVariable; - QList<QUmlInputPin *> loopVariableInput; - QList<QUmlOutputPin *> result; - QSet<QUmlExecutableNode *> setupPart; - QSet<QUmlExecutableNode *> test; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLLOOPNODE_P_H - diff --git a/src/uml/qumlmanifestation.cpp b/src/uml/qumlmanifestation.cpp index 475437db..fd45bae2 100644 --- a/src/uml/qumlmanifestation.cpp +++ b/src/uml/qumlmanifestation.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlmanifestation.h" -#include "qumlmanifestation_p.h" #include <QtUml/QUmlPackageableElement> QT_BEGIN_NAMESPACE -QUmlManifestationPrivate::QUmlManifestationPrivate() : - utilizedElement(0) -{ -} - /*! \class QUmlManifestation @@ -58,11 +52,9 @@ QUmlManifestationPrivate::QUmlManifestationPrivate() : \brief A manifestation is the concrete physical rendering of one or more model elements by an artifact. */ -QUmlManifestation::QUmlManifestation(bool create_d_ptr) : - QUmlAbstraction(false) +QUmlManifestation::QUmlManifestation() : + _utilizedElement(0) { - if (create_d_ptr) - set_d_ptr(new QUmlManifestationPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlPackageableElement *QUmlManifestation::utilizedElement() const { // This is a read-write association end - QM_D(const QUmlManifestation); - return d->utilizedElement; + return _utilizedElement; } void QUmlManifestation::setUtilizedElement(QUmlPackageableElement *utilizedElement) { // This is a read-write association end - QM_D(QUmlManifestation); - if (d->utilizedElement != utilizedElement) { - d->utilizedElement = utilizedElement; + if (_utilizedElement != utilizedElement) { + _utilizedElement = utilizedElement; } } diff --git a/src/uml/qumlmanifestation.h b/src/uml/qumlmanifestation.h index 9dec8796..fda136d1 100644 --- a/src/uml/qumlmanifestation.h +++ b/src/uml/qumlmanifestation.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlPackageableElement; -class QUmlManifestationPrivate; class Q_UML_EXPORT QUmlManifestation : public QUmlAbstraction { public: - QUmlManifestation(bool create_d_ptr = true); + QUmlManifestation(); // Owned attributes QUmlPackageableElement *utilizedElement() const; void setUtilizedElement(QUmlPackageableElement *utilizedElement); + +protected: + QUmlPackageableElement *_utilizedElement; }; QT_END_NAMESPACE diff --git a/src/uml/qumlmanifestation_p.h b/src/uml/qumlmanifestation_p.h deleted file mode 100644 index 70236d56..00000000 --- a/src/uml/qumlmanifestation_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMANIFESTATION_P_H -#define QUMLMANIFESTATION_P_H - -#include "QtUml/QUmlManifestation" - -#include "private/qumlabstraction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlManifestationPrivate : public QUmlAbstractionPrivate -{ -public: - QUmlManifestationPrivate(); - - QUmlPackageableElement *utilizedElement; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMANIFESTATION_P_H - diff --git a/src/uml/qumlmergenode.cpp b/src/uml/qumlmergenode.cpp index 94caaacb..4532ba2e 100644 --- a/src/uml/qumlmergenode.cpp +++ b/src/uml/qumlmergenode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlmergenode.h" -#include "qumlmergenode_p.h" QT_BEGIN_NAMESPACE -QUmlMergeNodePrivate::QUmlMergeNodePrivate() -{ -} - /*! \class QUmlMergeNode @@ -55,11 +50,8 @@ QUmlMergeNodePrivate::QUmlMergeNodePrivate() \brief A merge node is a control node that brings together multiple alternate flows. It is not used to synchronize concurrent flows but to accept one among several alternate flows. */ -QUmlMergeNode::QUmlMergeNode(bool create_d_ptr) : - QUmlControlNode(false) +QUmlMergeNode::QUmlMergeNode() { - if (create_d_ptr) - set_d_ptr(new QUmlMergeNodePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlmergenode.h b/src/uml/qumlmergenode.h index 98eebf85..58ca0644 100644 --- a/src/uml/qumlmergenode.h +++ b/src/uml/qumlmergenode.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlMergeNodePrivate; class Q_UML_EXPORT QUmlMergeNode : public QUmlControlNode { public: - QUmlMergeNode(bool create_d_ptr = true); + QUmlMergeNode(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlmergenode_p.h b/src/uml/qumlmergenode_p.h deleted file mode 100644 index 03406749..00000000 --- a/src/uml/qumlmergenode_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMERGENODE_P_H -#define QUMLMERGENODE_P_H - -#include "QtUml/QUmlMergeNode" - -#include "private/qumlcontrolnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlMergeNodePrivate : public QUmlControlNodePrivate -{ -public: - QUmlMergeNodePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMERGENODE_P_H - diff --git a/src/uml/qumlmessage.cpp b/src/uml/qumlmessage.cpp index e05ed502..1e16c3bb 100644 --- a/src/uml/qumlmessage.cpp +++ b/src/uml/qumlmessage.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlmessage.h" -#include "qumlmessage_p.h" #include <QtUml/QUmlConnector> #include <QtUml/QUmlInteraction> @@ -48,16 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlMessagePrivate::QUmlMessagePrivate() : - connector(0), - interaction(0), - messageSort(QtUml::MessageSynchCall), - receiveEvent(0), - sendEvent(0), - signature(0) -{ -} - /*! \class QUmlMessage @@ -66,11 +55,14 @@ QUmlMessagePrivate::QUmlMessagePrivate() : \brief A message defines a particular communication between lifelines of an interaction. */ -QUmlMessage::QUmlMessage(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlMessage::QUmlMessage() : + _connector(0), + _interaction(0), + _messageSort(QtUml::MessageSynchCall), + _receiveEvent(0), + _sendEvent(0), + _signature(0) { - if (create_d_ptr) - set_d_ptr(new QUmlMessagePrivate); } // OWNED ATTRIBUTES @@ -82,17 +74,15 @@ QList<QUmlValueSpecification *> QUmlMessage::argument() const { // This is a read-write association end - QM_D(const QUmlMessage); - return d->argument; + return _argument; } void QUmlMessage::addArgument(QUmlValueSpecification *argument) { // This is a read-write association end - QM_D(QUmlMessage); - if (!d->argument.contains(argument)) { - d->argument.append(argument); + if (!_argument.contains(argument)) { + _argument.append(argument); } } @@ -100,9 +90,8 @@ void QUmlMessage::removeArgument(QUmlValueSpecification *argument) { // This is a read-write association end - QM_D(QUmlMessage); - if (d->argument.contains(argument)) { - d->argument.removeAll(argument); + if (_argument.contains(argument)) { + _argument.removeAll(argument); } } @@ -113,17 +102,15 @@ QUmlConnector *QUmlMessage::connector() const { // This is a read-write association end - QM_D(const QUmlMessage); - return d->connector; + return _connector; } void QUmlMessage::setConnector(QUmlConnector *connector) { // This is a read-write association end - QM_D(QUmlMessage); - if (d->connector != connector) { - d->connector = connector; + if (_connector != connector) { + _connector = connector; } } @@ -134,17 +121,15 @@ QUmlInteraction *QUmlMessage::interaction() const { // This is a read-write association end - QM_D(const QUmlMessage); - return d->interaction; + return _interaction; } void QUmlMessage::setInteraction(QUmlInteraction *interaction) { // This is a read-write association end - QM_D(QUmlMessage); - if (d->interaction != interaction) { - d->interaction = interaction; + if (_interaction != interaction) { + _interaction = interaction; } } @@ -167,17 +152,15 @@ QtUml::MessageSort QUmlMessage::messageSort() const { // This is a read-write property - QM_D(const QUmlMessage); - return d->messageSort; + return _messageSort; } void QUmlMessage::setMessageSort(QtUml::MessageSort messageSort) { // This is a read-write property - QM_D(QUmlMessage); - if (d->messageSort != messageSort) { - d->messageSort = messageSort; + if (_messageSort != messageSort) { + _messageSort = messageSort; } } @@ -188,17 +171,15 @@ QUmlMessageEnd *QUmlMessage::receiveEvent() const { // This is a read-write association end - QM_D(const QUmlMessage); - return d->receiveEvent; + return _receiveEvent; } void QUmlMessage::setReceiveEvent(QUmlMessageEnd *receiveEvent) { // This is a read-write association end - QM_D(QUmlMessage); - if (d->receiveEvent != receiveEvent) { - d->receiveEvent = receiveEvent; + if (_receiveEvent != receiveEvent) { + _receiveEvent = receiveEvent; } } @@ -209,17 +190,15 @@ QUmlMessageEnd *QUmlMessage::sendEvent() const { // This is a read-write association end - QM_D(const QUmlMessage); - return d->sendEvent; + return _sendEvent; } void QUmlMessage::setSendEvent(QUmlMessageEnd *sendEvent) { // This is a read-write association end - QM_D(QUmlMessage); - if (d->sendEvent != sendEvent) { - d->sendEvent = sendEvent; + if (_sendEvent != sendEvent) { + _sendEvent = sendEvent; } } @@ -230,17 +209,15 @@ QUmlNamedElement *QUmlMessage::signature() const { // This is a read-write association end - QM_D(const QUmlMessage); - return d->signature; + return _signature; } void QUmlMessage::setSignature(QUmlNamedElement *signature) { // This is a read-write association end - QM_D(QUmlMessage); - if (d->signature != signature) { - d->signature = signature; + if (_signature != signature) { + _signature = signature; } } diff --git a/src/uml/qumlmessage.h b/src/uml/qumlmessage.h index 30160f65..6461b612 100644 --- a/src/uml/qumlmessage.h +++ b/src/uml/qumlmessage.h @@ -57,11 +57,10 @@ class QUmlInteraction; class QUmlMessageEnd; class QUmlValueSpecification; -class QUmlMessagePrivate; class Q_UML_EXPORT QUmlMessage : public QUmlNamedElement { public: - QUmlMessage(bool create_d_ptr = true); + QUmlMessage(); // Owned attributes QList<QUmlValueSpecification *> argument() const; @@ -80,6 +79,15 @@ public: void setSendEvent(QUmlMessageEnd *sendEvent); QUmlNamedElement *signature() const; void setSignature(QUmlNamedElement *signature); + +protected: + QList<QUmlValueSpecification *> _argument; + QUmlConnector *_connector; + QUmlInteraction *_interaction; + QtUml::MessageSort _messageSort; + QUmlMessageEnd *_receiveEvent; + QUmlMessageEnd *_sendEvent; + QUmlNamedElement *_signature; }; QT_END_NAMESPACE diff --git a/src/uml/qumlmessage_p.h b/src/uml/qumlmessage_p.h deleted file mode 100644 index 203e864c..00000000 --- a/src/uml/qumlmessage_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMESSAGE_P_H -#define QUMLMESSAGE_P_H - -#include "QtUml/QUmlMessage" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlMessagePrivate : public QUmlNamedElementPrivate -{ -public: - QUmlMessagePrivate(); - - QList<QUmlValueSpecification *> argument; - QUmlConnector *connector; - QUmlInteraction *interaction; - QtUml::MessageSort messageSort; - QUmlMessageEnd *receiveEvent; - QUmlMessageEnd *sendEvent; - QUmlNamedElement *signature; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMESSAGE_P_H - diff --git a/src/uml/qumlmessageend.cpp b/src/uml/qumlmessageend.cpp index 276d7588..49e45d3c 100644 --- a/src/uml/qumlmessageend.cpp +++ b/src/uml/qumlmessageend.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlmessageend.h" -#include "qumlmessageend_p.h" #include <QtUml/QUmlMessage> QT_BEGIN_NAMESPACE -QUmlMessageEndPrivate::QUmlMessageEndPrivate() : - message(0) -{ -} - /*! \class QUmlMessageEnd @@ -58,11 +52,9 @@ QUmlMessageEndPrivate::QUmlMessageEndPrivate() : \brief MessageEnd is an abstract specialization of NamedElement that represents what can occur at the end of a message. */ -QUmlMessageEnd::QUmlMessageEnd(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlMessageEnd::QUmlMessageEnd() : + _message(0) { - if (create_d_ptr) - set_d_ptr(new QUmlMessageEndPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlMessage *QUmlMessageEnd::message() const { // This is a read-write association end - QM_D(const QUmlMessageEnd); - return d->message; + return _message; } void QUmlMessageEnd::setMessage(QUmlMessage *message) { // This is a read-write association end - QM_D(QUmlMessageEnd); - if (d->message != message) { - d->message = message; + if (_message != message) { + _message = message; } } diff --git a/src/uml/qumlmessageend.h b/src/uml/qumlmessageend.h index 9d08f9e1..4c4fb8dd 100644 --- a/src/uml/qumlmessageend.h +++ b/src/uml/qumlmessageend.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlMessage; -class QUmlMessageEndPrivate; class Q_UML_EXPORT QUmlMessageEnd : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlMessageEnd(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlMessageEnd(); // Owned attributes QUmlMessage *message() const; void setMessage(QUmlMessage *message); + +protected: + QUmlMessage *_message; }; QT_END_NAMESPACE diff --git a/src/uml/qumlmessageend_p.h b/src/uml/qumlmessageend_p.h deleted file mode 100644 index bc395b47..00000000 --- a/src/uml/qumlmessageend_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMESSAGEEND_P_H -#define QUMLMESSAGEEND_P_H - -#include "QtUml/QUmlMessageEnd" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlMessageEndPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlMessageEndPrivate(); - - QUmlMessage *message; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMESSAGEEND_P_H - diff --git a/src/uml/qumlmessageevent.cpp b/src/uml/qumlmessageevent.cpp index 0f65a7ec..6230ac46 100644 --- a/src/uml/qumlmessageevent.cpp +++ b/src/uml/qumlmessageevent.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlmessageevent.h" -#include "qumlmessageevent_p.h" QT_BEGIN_NAMESPACE -QUmlMessageEventPrivate::QUmlMessageEventPrivate() -{ -} - /*! \class QUmlMessageEvent @@ -55,11 +50,8 @@ QUmlMessageEventPrivate::QUmlMessageEventPrivate() \brief A message event specifies the receipt by an object of either a call or a signal. */ -QUmlMessageEvent::QUmlMessageEvent(bool create_d_ptr) : - QUmlEvent(false) +QUmlMessageEvent::QUmlMessageEvent() { - if (create_d_ptr) - set_d_ptr(new QUmlMessageEventPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlmessageevent.h b/src/uml/qumlmessageevent.h index a86ea980..29a30db4 100644 --- a/src/uml/qumlmessageevent.h +++ b/src/uml/qumlmessageevent.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlMessageEventPrivate; class Q_UML_EXPORT QUmlMessageEvent : public QUmlEvent { public: - Q_DECL_HIDDEN QUmlMessageEvent(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlMessageEvent(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlmessageevent_p.h b/src/uml/qumlmessageevent_p.h deleted file mode 100644 index 249c3012..00000000 --- a/src/uml/qumlmessageevent_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMESSAGEEVENT_P_H -#define QUMLMESSAGEEVENT_P_H - -#include "QtUml/QUmlMessageEvent" - -#include "private/qumlevent_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlMessageEventPrivate : public QUmlEventPrivate -{ -public: - QUmlMessageEventPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMESSAGEEVENT_P_H - diff --git a/src/uml/qumlmessageoccurrencespecification.cpp b/src/uml/qumlmessageoccurrencespecification.cpp index 84fb0691..e91c4511 100644 --- a/src/uml/qumlmessageoccurrencespecification.cpp +++ b/src/uml/qumlmessageoccurrencespecification.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlmessageoccurrencespecification.h" -#include "qumlmessageoccurrencespecification_p.h" QT_BEGIN_NAMESPACE -QUmlMessageOccurrenceSpecificationPrivate::QUmlMessageOccurrenceSpecificationPrivate() -{ -} - /*! \class QUmlMessageOccurrenceSpecification @@ -55,12 +50,8 @@ QUmlMessageOccurrenceSpecificationPrivate::QUmlMessageOccurrenceSpecificationPri \brief A message occurrence specification pecifies the occurrence of message events, such as sending and receiving of signals or invoking or receiving of operation calls. A message occurrence specification is a kind of message end. Messages are generated either by synchronous operation calls or asynchronous signal sends. They are received by the execution of corresponding accept event actions. */ -QUmlMessageOccurrenceSpecification::QUmlMessageOccurrenceSpecification(bool create_d_ptr) : - QUmlOccurrenceSpecification(false), - QUmlMessageEnd(false) +QUmlMessageOccurrenceSpecification::QUmlMessageOccurrenceSpecification() { - if (create_d_ptr) - set_d_ptr(new QUmlMessageOccurrenceSpecificationPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlmessageoccurrencespecification.h b/src/uml/qumlmessageoccurrencespecification.h index d8e275dc..0d913b0d 100644 --- a/src/uml/qumlmessageoccurrencespecification.h +++ b/src/uml/qumlmessageoccurrencespecification.h @@ -52,11 +52,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlMessageOccurrenceSpecificationPrivate; class Q_UML_EXPORT QUmlMessageOccurrenceSpecification : public QUmlOccurrenceSpecification, public QUmlMessageEnd { public: - QUmlMessageOccurrenceSpecification(bool create_d_ptr = true); + QUmlMessageOccurrenceSpecification(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlmessageoccurrencespecification_p.h b/src/uml/qumlmessageoccurrencespecification_p.h deleted file mode 100644 index 8488a3cc..00000000 --- a/src/uml/qumlmessageoccurrencespecification_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMESSAGEOCCURRENCESPECIFICATION_P_H -#define QUMLMESSAGEOCCURRENCESPECIFICATION_P_H - -#include "QtUml/QUmlMessageOccurrenceSpecification" - -#include "private/qumloccurrencespecification_p.h" -#include "private/qumlmessageend_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlMessageOccurrenceSpecificationPrivate : public QUmlOccurrenceSpecificationPrivate, public QUmlMessageEndPrivate -{ -public: - QUmlMessageOccurrenceSpecificationPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMESSAGEOCCURRENCESPECIFICATION_P_H - diff --git a/src/uml/qumlmodel.cpp b/src/uml/qumlmodel.cpp index 4adb13c6..d9a0e186 100644 --- a/src/uml/qumlmodel.cpp +++ b/src/uml/qumlmodel.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlmodel.h" -#include "qumlmodel_p.h" QT_BEGIN_NAMESPACE -QUmlModelPrivate::QUmlModelPrivate() -{ -} - /*! \class QUmlModel @@ -55,13 +50,8 @@ QUmlModelPrivate::QUmlModelPrivate() \brief A model captures a view of a physical system. It is an abstraction of the physical system, with a certain purpose. This purpose determines what is to be included in the model and what is irrelevant. Thus the model completely describes those aspects of the physical system that are relevant to the purpose of the model, at the appropriate level of detail. */ -QUmlModel::QUmlModel(bool create_d_ptr) : - QUmlElement(false), - QUmlNamedElement(false), - QUmlPackage(false) +QUmlModel::QUmlModel() { - if (create_d_ptr) - set_d_ptr(new QUmlModelPrivate); } // OWNED ATTRIBUTES @@ -73,17 +63,15 @@ QString QUmlModel::viewpoint() const { // This is a read-write property - QM_D(const QUmlModel); - return d->viewpoint; + return _viewpoint; } void QUmlModel::setViewpoint(QString viewpoint) { // This is a read-write property - QM_D(QUmlModel); - if (d->viewpoint != viewpoint) { - d->viewpoint = viewpoint; + if (_viewpoint != viewpoint) { + _viewpoint = viewpoint; } } diff --git a/src/uml/qumlmodel.h b/src/uml/qumlmodel.h index f64fe5fd..4f18a63c 100644 --- a/src/uml/qumlmodel.h +++ b/src/uml/qumlmodel.h @@ -51,15 +51,17 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlModelPrivate; class Q_UML_EXPORT QUmlModel : public QUmlPackage { public: - QUmlModel(bool create_d_ptr = true); + QUmlModel(); // Owned attributes QString viewpoint() const; void setViewpoint(QString viewpoint); + +protected: + QString _viewpoint; }; QT_END_NAMESPACE diff --git a/src/uml/qumlmodel_p.h b/src/uml/qumlmodel_p.h deleted file mode 100644 index b93874c9..00000000 --- a/src/uml/qumlmodel_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMODEL_P_H -#define QUMLMODEL_P_H - -#include "QtUml/QUmlModel" - -#include "private/qumlpackage_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlModelPrivate : public QUmlPackagePrivate -{ -public: - QUmlModelPrivate(); - - QString viewpoint; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMODEL_P_H - diff --git a/src/uml/qumlmultiplicityelement.cpp b/src/uml/qumlmultiplicityelement.cpp index 44db4d89..f6313b69 100644 --- a/src/uml/qumlmultiplicityelement.cpp +++ b/src/uml/qumlmultiplicityelement.cpp @@ -39,20 +39,11 @@ ** ****************************************************************************/ #include "qumlmultiplicityelement.h" -#include "qumlmultiplicityelement_p.h" #include <QtUml/QUmlValueSpecification> QT_BEGIN_NAMESPACE -QUmlMultiplicityElementPrivate::QUmlMultiplicityElementPrivate() : - isOrdered(false), - isUnique(true), - lowerValue(0), - upperValue(0) -{ -} - /*! \class QUmlMultiplicityElement @@ -61,11 +52,12 @@ QUmlMultiplicityElementPrivate::QUmlMultiplicityElementPrivate() : \brief A multiplicity is a definition of an inclusive interval of non-negative integers beginning with a lower bound and ending with a (possibly infinite) upper bound. A multiplicity element embeds this information to specify the allowable cardinalities for an instantiation of this element. */ -QUmlMultiplicityElement::QUmlMultiplicityElement(bool create_d_ptr) : - QUmlElement(false) +QUmlMultiplicityElement::QUmlMultiplicityElement() : + _isOrdered(false), + _isUnique(true), + _lowerValue(0), + _upperValue(0) { - if (create_d_ptr) - set_d_ptr(new QUmlMultiplicityElementPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ bool QUmlMultiplicityElement::isOrdered() const { // This is a read-write property - QM_D(const QUmlMultiplicityElement); - return d->isOrdered; + return _isOrdered; } void QUmlMultiplicityElement::setOrdered(bool isOrdered) { // This is a read-write property - QM_D(QUmlMultiplicityElement); - if (d->isOrdered != isOrdered) { - d->isOrdered = isOrdered; + if (_isOrdered != isOrdered) { + _isOrdered = isOrdered; } } @@ -98,17 +88,15 @@ bool QUmlMultiplicityElement::isUnique() const { // This is a read-write property - QM_D(const QUmlMultiplicityElement); - return d->isUnique; + return _isUnique; } void QUmlMultiplicityElement::setUnique(bool isUnique) { // This is a read-write property - QM_D(QUmlMultiplicityElement); - if (d->isUnique != isUnique) { - d->isUnique = isUnique; + if (_isUnique != isUnique) { + _isUnique = isUnique; } } @@ -143,17 +131,15 @@ QUmlValueSpecification *QUmlMultiplicityElement::lowerValue() const { // This is a read-write association end - QM_D(const QUmlMultiplicityElement); - return d->lowerValue; + return _lowerValue; } void QUmlMultiplicityElement::setLowerValue(QUmlValueSpecification *lowerValue) { // This is a read-write association end - QM_D(QUmlMultiplicityElement); - if (d->lowerValue != lowerValue) { - d->lowerValue = lowerValue; + if (_lowerValue != lowerValue) { + _lowerValue = lowerValue; } } @@ -188,17 +174,15 @@ QUmlValueSpecification *QUmlMultiplicityElement::upperValue() const { // This is a read-write association end - QM_D(const QUmlMultiplicityElement); - return d->upperValue; + return _upperValue; } void QUmlMultiplicityElement::setUpperValue(QUmlValueSpecification *upperValue) { // This is a read-write association end - QM_D(QUmlMultiplicityElement); - if (d->upperValue != upperValue) { - d->upperValue = upperValue; + if (_upperValue != upperValue) { + _upperValue = upperValue; } } diff --git a/src/uml/qumlmultiplicityelement.h b/src/uml/qumlmultiplicityelement.h index 051d0255..72c04372 100644 --- a/src/uml/qumlmultiplicityelement.h +++ b/src/uml/qumlmultiplicityelement.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlValueSpecification; -class QUmlMultiplicityElementPrivate; class Q_UML_EXPORT QUmlMultiplicityElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN QUmlMultiplicityElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlMultiplicityElement(); // Owned attributes bool isOrdered() const; @@ -81,6 +80,12 @@ public: bool isMultivalued() const; int lowerBound() const; int upperBound() const; + +protected: + bool _isOrdered; + bool _isUnique; + QUmlValueSpecification *_lowerValue; + QUmlValueSpecification *_upperValue; }; QT_END_NAMESPACE diff --git a/src/uml/qumlmultiplicityelement_p.h b/src/uml/qumlmultiplicityelement_p.h deleted file mode 100644 index ed5c27fa..00000000 --- a/src/uml/qumlmultiplicityelement_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLMULTIPLICITYELEMENT_P_H -#define QUMLMULTIPLICITYELEMENT_P_H - -#include "QtUml/QUmlMultiplicityElement" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlMultiplicityElementPrivate : public virtual QUmlElementPrivate -{ -public: - QUmlMultiplicityElementPrivate(); - - bool isOrdered; - bool isUnique; - QUmlValueSpecification *lowerValue; - QUmlValueSpecification *upperValue; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLMULTIPLICITYELEMENT_P_H - diff --git a/src/uml/qumlnamedelement.cpp b/src/uml/qumlnamedelement.cpp index 4a77cfdc..af716ba6 100644 --- a/src/uml/qumlnamedelement.cpp +++ b/src/uml/qumlnamedelement.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlnamedelement.h" -#include "qumlnamedelement_p.h" #include <QtUml/QUmlDependency> #include <QtUml/QUmlNamespace> @@ -48,12 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlNamedElementPrivate::QUmlNamedElementPrivate() : - nameExpression(0), - namespace_(0) -{ -} - /*! \class QUmlNamedElement @@ -62,11 +55,10 @@ QUmlNamedElementPrivate::QUmlNamedElementPrivate() : \brief A named element supports using a string expression to specify its name. This allows names of model elements to involve template parameters. The actual name is evaluated from the string expression only when it is sensible to do so (e.g., when a template is bound).A named element is an element in a model that may have a name. */ -QUmlNamedElement::QUmlNamedElement(bool create_d_ptr) : - QUmlElement(false) +QUmlNamedElement::QUmlNamedElement() : + _nameExpression(0), + _namespace_(0) { - if (create_d_ptr) - set_d_ptr(new QUmlNamedElementPrivate); } // OWNED ATTRIBUTES @@ -78,17 +70,15 @@ QSet<QUmlDependency *> QUmlNamedElement::clientDependency() const { // This is a read-write association end - QM_D(const QUmlNamedElement); - return d->clientDependency; + return _clientDependency; } void QUmlNamedElement::addClientDependency(QUmlDependency *clientDependency) { // This is a read-write association end - QM_D(QUmlNamedElement); - if (!d->clientDependency.contains(clientDependency)) { - d->clientDependency.insert(clientDependency); + if (!_clientDependency.contains(clientDependency)) { + _clientDependency.insert(clientDependency); } } @@ -96,9 +86,8 @@ void QUmlNamedElement::removeClientDependency(QUmlDependency *clientDependency) { // This is a read-write association end - QM_D(QUmlNamedElement); - if (d->clientDependency.contains(clientDependency)) { - d->clientDependency.remove(clientDependency); + if (_clientDependency.contains(clientDependency)) { + _clientDependency.remove(clientDependency); } } @@ -109,17 +98,15 @@ QString QUmlNamedElement::name() const { // This is a read-write property - QM_D(const QUmlNamedElement); - return d->name; + return _name; } void QUmlNamedElement::setName(QString name) { // This is a read-write property - QM_D(QUmlNamedElement); - if (d->name != name) { - d->name = name; + if (_name != name) { + _name = name; } } @@ -130,17 +117,15 @@ QUmlStringExpression *QUmlNamedElement::nameExpression() const { // This is a read-write association end - QM_D(const QUmlNamedElement); - return d->nameExpression; + return _nameExpression; } void QUmlNamedElement::setNameExpression(QUmlStringExpression *nameExpression) { // This is a read-write association end - QM_D(QUmlNamedElement); - if (d->nameExpression != nameExpression) { - d->nameExpression = nameExpression; + if (_nameExpression != nameExpression) { + _nameExpression = nameExpression; } } @@ -151,8 +136,7 @@ QUmlNamespace *QUmlNamedElement::namespace_() const { // This is a read-only derived union association end - QM_D(const QUmlNamedElement); - return d->namespace_; + return _namespace_; } /*! @@ -174,17 +158,15 @@ QtUml::VisibilityKind QUmlNamedElement::visibility() const { // This is a read-write property - QM_D(const QUmlNamedElement); - return d->visibility; + return _visibility; } void QUmlNamedElement::setVisibility(QtUml::VisibilityKind visibility) { // This is a read-write property - QM_D(QUmlNamedElement); - if (d->visibility != visibility) { - d->visibility = visibility; + if (_visibility != visibility) { + _visibility = visibility; } } diff --git a/src/uml/qumlnamedelement.h b/src/uml/qumlnamedelement.h index 3173d0fe..901ac958 100644 --- a/src/uml/qumlnamedelement.h +++ b/src/uml/qumlnamedelement.h @@ -57,11 +57,10 @@ class QUmlNamespace; class QUmlPackage; class QUmlStringExpression; -class QUmlNamedElementPrivate; class Q_UML_EXPORT QUmlNamedElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN QUmlNamedElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlNamedElement(); // Owned attributes QSet<QUmlDependency *> clientDependency() const; @@ -81,6 +80,13 @@ public: QSet<QUmlPackage *> allOwningPackages() const; bool isDistinguishableFrom(QUmlNamedElement *n, QUmlNamespace *ns) const; QString separator() const; + +protected: + QSet<QUmlDependency *> _clientDependency; + QString _name; + QUmlStringExpression *_nameExpression; + QUmlNamespace *_namespace_; + QtUml::VisibilityKind _visibility; }; QT_END_NAMESPACE diff --git a/src/uml/qumlnamedelement_p.h b/src/uml/qumlnamedelement_p.h deleted file mode 100644 index 5adc48fc..00000000 --- a/src/uml/qumlnamedelement_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLNAMEDELEMENT_P_H -#define QUMLNAMEDELEMENT_P_H - -#include "QtUml/QUmlNamedElement" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlNamedElementPrivate : public virtual QUmlElementPrivate -{ -public: - QUmlNamedElementPrivate(); - - QSet<QUmlDependency *> clientDependency; - QString name; - QUmlStringExpression *nameExpression; - QUmlNamespace *namespace_; - QtUml::VisibilityKind visibility; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLNAMEDELEMENT_P_H - diff --git a/src/uml/qumlnamespace.cpp b/src/uml/qumlnamespace.cpp index 8bab6b70..7f230a56 100644 --- a/src/uml/qumlnamespace.cpp +++ b/src/uml/qumlnamespace.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlnamespace.h" -#include "qumlnamespace_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlElementImport> @@ -48,10 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlNamespacePrivate::QUmlNamespacePrivate() -{ -} - /*! \class QUmlNamespace @@ -60,11 +55,8 @@ QUmlNamespacePrivate::QUmlNamespacePrivate() \brief A namespace is an element in a model that contains a set of named elements that can be identified by name. */ -QUmlNamespace::QUmlNamespace(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlNamespace::QUmlNamespace() { - if (create_d_ptr) - set_d_ptr(new QUmlNamespacePrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QSet<QUmlElementImport *> QUmlNamespace::elementImport() const { // This is a read-write association end - QM_D(const QUmlNamespace); - return d->elementImport; + return _elementImport; } void QUmlNamespace::addElementImport(QUmlElementImport *elementImport) { // This is a read-write association end - QM_D(QUmlNamespace); - if (!d->elementImport.contains(elementImport)) { - d->elementImport.insert(elementImport); + if (!_elementImport.contains(elementImport)) { + _elementImport.insert(elementImport); } } @@ -94,9 +84,8 @@ void QUmlNamespace::removeElementImport(QUmlElementImport *elementImport) { // This is a read-write association end - QM_D(QUmlNamespace); - if (d->elementImport.contains(elementImport)) { - d->elementImport.remove(elementImport); + if (_elementImport.contains(elementImport)) { + _elementImport.remove(elementImport); } } @@ -119,8 +108,7 @@ QSet<QUmlNamedElement *> QUmlNamespace::member() const { // This is a read-only derived union association end - QM_D(const QUmlNamespace); - return d->member; + return _member; } /*! @@ -130,8 +118,7 @@ QSet<QUmlNamedElement *> QUmlNamespace::ownedMember() const { // This is a read-only derived union association end - QM_D(const QUmlNamespace); - return d->ownedMember; + return _ownedMember; } /*! @@ -141,17 +128,15 @@ QSet<QUmlConstraint *> QUmlNamespace::ownedRule() const { // This is a read-write association end - QM_D(const QUmlNamespace); - return d->ownedRule; + return _ownedRule; } void QUmlNamespace::addOwnedRule(QUmlConstraint *ownedRule) { // This is a read-write association end - QM_D(QUmlNamespace); - if (!d->ownedRule.contains(ownedRule)) { - d->ownedRule.insert(ownedRule); + if (!_ownedRule.contains(ownedRule)) { + _ownedRule.insert(ownedRule); } } @@ -159,9 +144,8 @@ void QUmlNamespace::removeOwnedRule(QUmlConstraint *ownedRule) { // This is a read-write association end - QM_D(QUmlNamespace); - if (d->ownedRule.contains(ownedRule)) { - d->ownedRule.remove(ownedRule); + if (_ownedRule.contains(ownedRule)) { + _ownedRule.remove(ownedRule); } } @@ -172,17 +156,15 @@ QSet<QUmlPackageImport *> QUmlNamespace::packageImport() const { // This is a read-write association end - QM_D(const QUmlNamespace); - return d->packageImport; + return _packageImport; } void QUmlNamespace::addPackageImport(QUmlPackageImport *packageImport) { // This is a read-write association end - QM_D(QUmlNamespace); - if (!d->packageImport.contains(packageImport)) { - d->packageImport.insert(packageImport); + if (!_packageImport.contains(packageImport)) { + _packageImport.insert(packageImport); } } @@ -190,9 +172,8 @@ void QUmlNamespace::removePackageImport(QUmlPackageImport *packageImport) { // This is a read-write association end - QM_D(QUmlNamespace); - if (d->packageImport.contains(packageImport)) { - d->packageImport.remove(packageImport); + if (_packageImport.contains(packageImport)) { + _packageImport.remove(packageImport); } } diff --git a/src/uml/qumlnamespace.h b/src/uml/qumlnamespace.h index 5e181b49..9d3243f7 100644 --- a/src/uml/qumlnamespace.h +++ b/src/uml/qumlnamespace.h @@ -56,11 +56,10 @@ class QUmlElementImport; class QUmlPackageableElement; class QUmlPackageImport; -class QUmlNamespacePrivate; class Q_UML_EXPORT QUmlNamespace : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlNamespace(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlNamespace(); // Owned attributes QSet<QUmlElementImport *> elementImport() const; @@ -81,6 +80,13 @@ public: QSet<QString> getNamesOfMember(QUmlNamedElement *element) const; QSet<QUmlPackageableElement *> importMembers(QSet<QUmlPackageableElement *> imps) const; bool membersAreDistinguishable() const; + +protected: + QSet<QUmlElementImport *> _elementImport; + QSet<QUmlNamedElement *> _member; + QSet<QUmlNamedElement *> _ownedMember; + QSet<QUmlConstraint *> _ownedRule; + QSet<QUmlPackageImport *> _packageImport; }; QT_END_NAMESPACE diff --git a/src/uml/qumlnamespace_p.h b/src/uml/qumlnamespace_p.h deleted file mode 100644 index faf0f3ec..00000000 --- a/src/uml/qumlnamespace_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLNAMESPACE_P_H -#define QUMLNAMESPACE_P_H - -#include "QtUml/QUmlNamespace" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlNamespacePrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlNamespacePrivate(); - - QSet<QUmlElementImport *> elementImport; - QSet<QUmlNamedElement *> member; - QSet<QUmlNamedElement *> ownedMember; - QSet<QUmlConstraint *> ownedRule; - QSet<QUmlPackageImport *> packageImport; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLNAMESPACE_P_H - diff --git a/src/uml/qumlnode.cpp b/src/uml/qumlnode.cpp index ca751e0d..ce52588a 100644 --- a/src/uml/qumlnode.cpp +++ b/src/uml/qumlnode.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlnode.h" -#include "qumlnode_p.h" QT_BEGIN_NAMESPACE -QUmlNodePrivate::QUmlNodePrivate() -{ -} - /*! \class QUmlNode @@ -55,12 +50,8 @@ QUmlNodePrivate::QUmlNodePrivate() \brief A node is computational resource upon which artifacts may be deployed for execution. Nodes can be interconnected through communication paths to define network structures. */ -QUmlNode::QUmlNode(bool create_d_ptr) : - QUmlClass(false), - QUmlDeploymentTarget(false) +QUmlNode::QUmlNode() { - if (create_d_ptr) - set_d_ptr(new QUmlNodePrivate); } // OWNED ATTRIBUTES @@ -72,17 +63,15 @@ QSet<QUmlNode *> QUmlNode::nestedNode() const { // This is a read-write association end - QM_D(const QUmlNode); - return d->nestedNode; + return _nestedNode; } void QUmlNode::addNestedNode(QUmlNode *nestedNode) { // This is a read-write association end - QM_D(QUmlNode); - if (!d->nestedNode.contains(nestedNode)) { - d->nestedNode.insert(nestedNode); + if (!_nestedNode.contains(nestedNode)) { + _nestedNode.insert(nestedNode); } } @@ -90,9 +79,8 @@ void QUmlNode::removeNestedNode(QUmlNode *nestedNode) { // This is a read-write association end - QM_D(QUmlNode); - if (d->nestedNode.contains(nestedNode)) { - d->nestedNode.remove(nestedNode); + if (_nestedNode.contains(nestedNode)) { + _nestedNode.remove(nestedNode); } } diff --git a/src/uml/qumlnode.h b/src/uml/qumlnode.h index 8e707021..020b3819 100644 --- a/src/uml/qumlnode.h +++ b/src/uml/qumlnode.h @@ -52,16 +52,18 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlNodePrivate; class Q_UML_EXPORT QUmlNode : public QUmlClass, public QUmlDeploymentTarget { public: - QUmlNode(bool create_d_ptr = true); + QUmlNode(); // Owned attributes QSet<QUmlNode *> nestedNode() const; void addNestedNode(QUmlNode *nestedNode); void removeNestedNode(QUmlNode *nestedNode); + +protected: + QSet<QUmlNode *> _nestedNode; }; QT_END_NAMESPACE diff --git a/src/uml/qumlnode_p.h b/src/uml/qumlnode_p.h deleted file mode 100644 index 8be5db07..00000000 --- a/src/uml/qumlnode_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLNODE_P_H -#define QUMLNODE_P_H - -#include "QtUml/QUmlNode" - -#include "private/qumlclass_p.h" -#include "private/qumldeploymenttarget_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlNodePrivate : public QUmlClassPrivate, public QUmlDeploymentTargetPrivate -{ -public: - QUmlNodePrivate(); - - QSet<QUmlNode *> nestedNode; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLNODE_P_H - diff --git a/src/uml/qumlobjectflow.cpp b/src/uml/qumlobjectflow.cpp index ddf03a87..ad458713 100644 --- a/src/uml/qumlobjectflow.cpp +++ b/src/uml/qumlobjectflow.cpp @@ -39,20 +39,11 @@ ** ****************************************************************************/ #include "qumlobjectflow.h" -#include "qumlobjectflow_p.h" #include <QtUml/QUmlBehavior> QT_BEGIN_NAMESPACE -QUmlObjectFlowPrivate::QUmlObjectFlowPrivate() : - isMulticast(false), - isMultireceive(false), - selection(0), - transformation(0) -{ -} - /*! \class QUmlObjectFlow @@ -61,11 +52,12 @@ QUmlObjectFlowPrivate::QUmlObjectFlowPrivate() : \brief An object flow is an activity edge that can have objects or data passing along it.Object flows have support for multicast/receive, token selection from object nodes, and transformation of tokens. */ -QUmlObjectFlow::QUmlObjectFlow(bool create_d_ptr) : - QUmlActivityEdge(false) +QUmlObjectFlow::QUmlObjectFlow() : + _isMulticast(false), + _isMultireceive(false), + _selection(0), + _transformation(0) { - if (create_d_ptr) - set_d_ptr(new QUmlObjectFlowPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ bool QUmlObjectFlow::isMulticast() const { // This is a read-write property - QM_D(const QUmlObjectFlow); - return d->isMulticast; + return _isMulticast; } void QUmlObjectFlow::setMulticast(bool isMulticast) { // This is a read-write property - QM_D(QUmlObjectFlow); - if (d->isMulticast != isMulticast) { - d->isMulticast = isMulticast; + if (_isMulticast != isMulticast) { + _isMulticast = isMulticast; } } @@ -98,17 +88,15 @@ bool QUmlObjectFlow::isMultireceive() const { // This is a read-write property - QM_D(const QUmlObjectFlow); - return d->isMultireceive; + return _isMultireceive; } void QUmlObjectFlow::setMultireceive(bool isMultireceive) { // This is a read-write property - QM_D(QUmlObjectFlow); - if (d->isMultireceive != isMultireceive) { - d->isMultireceive = isMultireceive; + if (_isMultireceive != isMultireceive) { + _isMultireceive = isMultireceive; } } @@ -119,17 +107,15 @@ QUmlBehavior *QUmlObjectFlow::selection() const { // This is a read-write association end - QM_D(const QUmlObjectFlow); - return d->selection; + return _selection; } void QUmlObjectFlow::setSelection(QUmlBehavior *selection) { // This is a read-write association end - QM_D(QUmlObjectFlow); - if (d->selection != selection) { - d->selection = selection; + if (_selection != selection) { + _selection = selection; } } @@ -140,17 +126,15 @@ QUmlBehavior *QUmlObjectFlow::transformation() const { // This is a read-write association end - QM_D(const QUmlObjectFlow); - return d->transformation; + return _transformation; } void QUmlObjectFlow::setTransformation(QUmlBehavior *transformation) { // This is a read-write association end - QM_D(QUmlObjectFlow); - if (d->transformation != transformation) { - d->transformation = transformation; + if (_transformation != transformation) { + _transformation = transformation; } } diff --git a/src/uml/qumlobjectflow.h b/src/uml/qumlobjectflow.h index 8772baef..57327c2e 100644 --- a/src/uml/qumlobjectflow.h +++ b/src/uml/qumlobjectflow.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlBehavior; -class QUmlObjectFlowPrivate; class Q_UML_EXPORT QUmlObjectFlow : public QUmlActivityEdge { public: - QUmlObjectFlow(bool create_d_ptr = true); + QUmlObjectFlow(); // Owned attributes bool isMulticast() const; @@ -68,6 +67,12 @@ public: void setSelection(QUmlBehavior *selection); QUmlBehavior *transformation() const; void setTransformation(QUmlBehavior *transformation); + +protected: + bool _isMulticast; + bool _isMultireceive; + QUmlBehavior *_selection; + QUmlBehavior *_transformation; }; QT_END_NAMESPACE diff --git a/src/uml/qumlobjectflow_p.h b/src/uml/qumlobjectflow_p.h deleted file mode 100644 index 59acddff..00000000 --- a/src/uml/qumlobjectflow_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOBJECTFLOW_P_H -#define QUMLOBJECTFLOW_P_H - -#include "QtUml/QUmlObjectFlow" - -#include "private/qumlactivityedge_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlObjectFlowPrivate : public QUmlActivityEdgePrivate -{ -public: - QUmlObjectFlowPrivate(); - - bool isMulticast; - bool isMultireceive; - QUmlBehavior *selection; - QUmlBehavior *transformation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOBJECTFLOW_P_H - diff --git a/src/uml/qumlobjectnode.cpp b/src/uml/qumlobjectnode.cpp index 30fd9b08..570b93d4 100644 --- a/src/uml/qumlobjectnode.cpp +++ b/src/uml/qumlobjectnode.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlobjectnode.h" -#include "qumlobjectnode_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlState> @@ -47,14 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlObjectNodePrivate::QUmlObjectNodePrivate() : - isControlType(false), - ordering(QtUml::ObjectNodeOrderingFIFO), - selection(0), - upperBound(0) -{ -} - /*! \class QUmlObjectNode @@ -63,12 +54,12 @@ QUmlObjectNodePrivate::QUmlObjectNodePrivate() : \brief An object node is an abstract activity node that is part of defining object flow in an activity.Object nodes have support for token selection, limitation on the number of tokens, specifying the state required for tokens, and carrying control values. */ -QUmlObjectNode::QUmlObjectNode(bool create_d_ptr) : - QUmlActivityNode(false), - QUmlTypedElement(false) +QUmlObjectNode::QUmlObjectNode() : + _isControlType(false), + _ordering(QtUml::ObjectNodeOrderingFIFO), + _selection(0), + _upperBound(0) { - if (create_d_ptr) - set_d_ptr(new QUmlObjectNodePrivate); } // OWNED ATTRIBUTES @@ -80,17 +71,15 @@ QSet<QUmlState *> QUmlObjectNode::inState() const { // This is a read-write association end - QM_D(const QUmlObjectNode); - return d->inState; + return _inState; } void QUmlObjectNode::addInState(QUmlState *inState) { // This is a read-write association end - QM_D(QUmlObjectNode); - if (!d->inState.contains(inState)) { - d->inState.insert(inState); + if (!_inState.contains(inState)) { + _inState.insert(inState); } } @@ -98,9 +87,8 @@ void QUmlObjectNode::removeInState(QUmlState *inState) { // This is a read-write association end - QM_D(QUmlObjectNode); - if (d->inState.contains(inState)) { - d->inState.remove(inState); + if (_inState.contains(inState)) { + _inState.remove(inState); } } @@ -111,17 +99,15 @@ bool QUmlObjectNode::isControlType() const { // This is a read-write property - QM_D(const QUmlObjectNode); - return d->isControlType; + return _isControlType; } void QUmlObjectNode::setControlType(bool isControlType) { // This is a read-write property - QM_D(QUmlObjectNode); - if (d->isControlType != isControlType) { - d->isControlType = isControlType; + if (_isControlType != isControlType) { + _isControlType = isControlType; } } @@ -132,17 +118,15 @@ QtUml::ObjectNodeOrderingKind QUmlObjectNode::ordering() const { // This is a read-write property - QM_D(const QUmlObjectNode); - return d->ordering; + return _ordering; } void QUmlObjectNode::setOrdering(QtUml::ObjectNodeOrderingKind ordering) { // This is a read-write property - QM_D(QUmlObjectNode); - if (d->ordering != ordering) { - d->ordering = ordering; + if (_ordering != ordering) { + _ordering = ordering; } } @@ -153,17 +137,15 @@ QUmlBehavior *QUmlObjectNode::selection() const { // This is a read-write association end - QM_D(const QUmlObjectNode); - return d->selection; + return _selection; } void QUmlObjectNode::setSelection(QUmlBehavior *selection) { // This is a read-write association end - QM_D(QUmlObjectNode); - if (d->selection != selection) { - d->selection = selection; + if (_selection != selection) { + _selection = selection; } } @@ -174,17 +156,15 @@ QUmlValueSpecification *QUmlObjectNode::upperBound() const { // This is a read-write association end - QM_D(const QUmlObjectNode); - return d->upperBound; + return _upperBound; } void QUmlObjectNode::setUpperBound(QUmlValueSpecification *upperBound) { // This is a read-write association end - QM_D(QUmlObjectNode); - if (d->upperBound != upperBound) { - d->upperBound = upperBound; + if (_upperBound != upperBound) { + _upperBound = upperBound; } } diff --git a/src/uml/qumlobjectnode.h b/src/uml/qumlobjectnode.h index a7e8851c..676ee69a 100644 --- a/src/uml/qumlobjectnode.h +++ b/src/uml/qumlobjectnode.h @@ -57,11 +57,10 @@ class QUmlBehavior; class QUmlState; class QUmlValueSpecification; -class QUmlObjectNodePrivate; class Q_UML_EXPORT QUmlObjectNode : public QUmlActivityNode, public QUmlTypedElement { public: - Q_DECL_HIDDEN QUmlObjectNode(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlObjectNode(); // Owned attributes QSet<QUmlState *> inState() const; @@ -75,6 +74,13 @@ public: void setSelection(QUmlBehavior *selection); QUmlValueSpecification *upperBound() const; void setUpperBound(QUmlValueSpecification *upperBound); + +protected: + QSet<QUmlState *> _inState; + bool _isControlType; + QtUml::ObjectNodeOrderingKind _ordering; + QUmlBehavior *_selection; + QUmlValueSpecification *_upperBound; }; QT_END_NAMESPACE diff --git a/src/uml/qumlobjectnode_p.h b/src/uml/qumlobjectnode_p.h deleted file mode 100644 index 4dd74153..00000000 --- a/src/uml/qumlobjectnode_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOBJECTNODE_P_H -#define QUMLOBJECTNODE_P_H - -#include "QtUml/QUmlObjectNode" - -#include "private/qumlactivitynode_p.h" -#include "private/qumltypedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlObjectNodePrivate : public QUmlActivityNodePrivate, public QUmlTypedElementPrivate -{ -public: - QUmlObjectNodePrivate(); - - QSet<QUmlState *> inState; - bool isControlType; - QtUml::ObjectNodeOrderingKind ordering; - QUmlBehavior *selection; - QUmlValueSpecification *upperBound; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOBJECTNODE_P_H - diff --git a/src/uml/qumlobservation.cpp b/src/uml/qumlobservation.cpp index 6ffef794..b2431821 100644 --- a/src/uml/qumlobservation.cpp +++ b/src/uml/qumlobservation.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlobservation.h" -#include "qumlobservation_p.h" QT_BEGIN_NAMESPACE -QUmlObservationPrivate::QUmlObservationPrivate() -{ -} - /*! \class QUmlObservation @@ -55,11 +50,8 @@ QUmlObservationPrivate::QUmlObservationPrivate() \brief Observation is a superclass of TimeObservation and DurationObservation in order for TimeExpression and Duration to refer to either in a simple way. */ -QUmlObservation::QUmlObservation(bool create_d_ptr) : - QUmlPackageableElement(false) +QUmlObservation::QUmlObservation() { - if (create_d_ptr) - set_d_ptr(new QUmlObservationPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlobservation.h b/src/uml/qumlobservation.h index 034efdee..4a959ac1 100644 --- a/src/uml/qumlobservation.h +++ b/src/uml/qumlobservation.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlObservationPrivate; class Q_UML_EXPORT QUmlObservation : public QUmlPackageableElement { public: - Q_DECL_HIDDEN QUmlObservation(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlObservation(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlobservation_p.h b/src/uml/qumlobservation_p.h deleted file mode 100644 index 18f273bc..00000000 --- a/src/uml/qumlobservation_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOBSERVATION_P_H -#define QUMLOBSERVATION_P_H - -#include "QtUml/QUmlObservation" - -#include "private/qumlpackageableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlObservationPrivate : public QUmlPackageableElementPrivate -{ -public: - QUmlObservationPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOBSERVATION_P_H - diff --git a/src/uml/qumloccurrencespecification.cpp b/src/uml/qumloccurrencespecification.cpp index 97179cef..5b990b89 100644 --- a/src/uml/qumloccurrencespecification.cpp +++ b/src/uml/qumloccurrencespecification.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumloccurrencespecification.h" -#include "qumloccurrencespecification_p.h" #include <QtUml/QUmlGeneralOrdering> #include <QtUml/QUmlLifeline> QT_BEGIN_NAMESPACE -QUmlOccurrenceSpecificationPrivate::QUmlOccurrenceSpecificationPrivate() : - covered(0) -{ -} - /*! \class QUmlOccurrenceSpecification @@ -59,11 +53,9 @@ QUmlOccurrenceSpecificationPrivate::QUmlOccurrenceSpecificationPrivate() : \brief An occurrence specification is the basic semantic unit of interactions. The sequences of occurrences specified by them are the meanings of interactions. */ -QUmlOccurrenceSpecification::QUmlOccurrenceSpecification(bool create_d_ptr) : - QUmlInteractionFragment(false) +QUmlOccurrenceSpecification::QUmlOccurrenceSpecification() : + _covered(0) { - if (create_d_ptr) - set_d_ptr(new QUmlOccurrenceSpecificationPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlLifeline *QUmlOccurrenceSpecification::covered() const { // This is a read-write association end - QM_D(const QUmlOccurrenceSpecification); - return d->covered; + return _covered; } void QUmlOccurrenceSpecification::setCovered(QUmlLifeline *covered) { // This is a read-write association end - QM_D(QUmlOccurrenceSpecification); - if (d->covered != covered) { - d->covered = covered; + if (_covered != covered) { + _covered = covered; } } @@ -96,17 +86,15 @@ QSet<QUmlGeneralOrdering *> QUmlOccurrenceSpecification::toAfter() const { // This is a read-write association end - QM_D(const QUmlOccurrenceSpecification); - return d->toAfter; + return _toAfter; } void QUmlOccurrenceSpecification::addToAfter(QUmlGeneralOrdering *toAfter) { // This is a read-write association end - QM_D(QUmlOccurrenceSpecification); - if (!d->toAfter.contains(toAfter)) { - d->toAfter.insert(toAfter); + if (!_toAfter.contains(toAfter)) { + _toAfter.insert(toAfter); } } @@ -114,9 +102,8 @@ void QUmlOccurrenceSpecification::removeToAfter(QUmlGeneralOrdering *toAfter) { // This is a read-write association end - QM_D(QUmlOccurrenceSpecification); - if (d->toAfter.contains(toAfter)) { - d->toAfter.remove(toAfter); + if (_toAfter.contains(toAfter)) { + _toAfter.remove(toAfter); } } @@ -127,17 +114,15 @@ QSet<QUmlGeneralOrdering *> QUmlOccurrenceSpecification::toBefore() const { // This is a read-write association end - QM_D(const QUmlOccurrenceSpecification); - return d->toBefore; + return _toBefore; } void QUmlOccurrenceSpecification::addToBefore(QUmlGeneralOrdering *toBefore) { // This is a read-write association end - QM_D(QUmlOccurrenceSpecification); - if (!d->toBefore.contains(toBefore)) { - d->toBefore.insert(toBefore); + if (!_toBefore.contains(toBefore)) { + _toBefore.insert(toBefore); } } @@ -145,9 +130,8 @@ void QUmlOccurrenceSpecification::removeToBefore(QUmlGeneralOrdering *toBefore) { // This is a read-write association end - QM_D(QUmlOccurrenceSpecification); - if (d->toBefore.contains(toBefore)) { - d->toBefore.remove(toBefore); + if (_toBefore.contains(toBefore)) { + _toBefore.remove(toBefore); } } diff --git a/src/uml/qumloccurrencespecification.h b/src/uml/qumloccurrencespecification.h index 535873c4..063fde92 100644 --- a/src/uml/qumloccurrencespecification.h +++ b/src/uml/qumloccurrencespecification.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlGeneralOrdering; class QUmlLifeline; -class QUmlOccurrenceSpecificationPrivate; class Q_UML_EXPORT QUmlOccurrenceSpecification : public QUmlInteractionFragment { public: - QUmlOccurrenceSpecification(bool create_d_ptr = true); + QUmlOccurrenceSpecification(); // Owned attributes QUmlLifeline *covered() const; @@ -69,6 +68,11 @@ public: QSet<QUmlGeneralOrdering *> toBefore() const; void addToBefore(QUmlGeneralOrdering *toBefore); void removeToBefore(QUmlGeneralOrdering *toBefore); + +protected: + QUmlLifeline *_covered; + QSet<QUmlGeneralOrdering *> _toAfter; + QSet<QUmlGeneralOrdering *> _toBefore; }; QT_END_NAMESPACE diff --git a/src/uml/qumloccurrencespecification_p.h b/src/uml/qumloccurrencespecification_p.h deleted file mode 100644 index 851cc568..00000000 --- a/src/uml/qumloccurrencespecification_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOCCURRENCESPECIFICATION_P_H -#define QUMLOCCURRENCESPECIFICATION_P_H - -#include "QtUml/QUmlOccurrenceSpecification" - -#include "private/qumlinteractionfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlOccurrenceSpecificationPrivate : public QUmlInteractionFragmentPrivate -{ -public: - QUmlOccurrenceSpecificationPrivate(); - - QUmlLifeline *covered; - QSet<QUmlGeneralOrdering *> toAfter; - QSet<QUmlGeneralOrdering *> toBefore; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOCCURRENCESPECIFICATION_P_H - diff --git a/src/uml/qumlopaqueaction.cpp b/src/uml/qumlopaqueaction.cpp index 23db45b6..d81fa85a 100644 --- a/src/uml/qumlopaqueaction.cpp +++ b/src/uml/qumlopaqueaction.cpp @@ -39,17 +39,12 @@ ** ****************************************************************************/ #include "qumlopaqueaction.h" -#include "qumlopaqueaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlOpaqueActionPrivate::QUmlOpaqueActionPrivate() -{ -} - /*! \class QUmlOpaqueAction @@ -58,11 +53,8 @@ QUmlOpaqueActionPrivate::QUmlOpaqueActionPrivate() \brief An action with implementation-specific semantics. */ -QUmlOpaqueAction::QUmlOpaqueAction(bool create_d_ptr) : - QUmlAction(false) +QUmlOpaqueAction::QUmlOpaqueAction() { - if (create_d_ptr) - set_d_ptr(new QUmlOpaqueActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QList<QString> QUmlOpaqueAction::body() const { // This is a read-write property - QM_D(const QUmlOpaqueAction); - return d->body; + return _body; } void QUmlOpaqueAction::addBody(QString body) { // This is a read-write property - QM_D(QUmlOpaqueAction); - if (!d->body.contains(body)) { - d->body.append(body); + if (!_body.contains(body)) { + _body.append(body); } } @@ -92,9 +82,8 @@ void QUmlOpaqueAction::removeBody(QString body) { // This is a read-write property - QM_D(QUmlOpaqueAction); - if (d->body.contains(body)) { - d->body.removeAll(body); + if (_body.contains(body)) { + _body.removeAll(body); } } @@ -105,17 +94,15 @@ QSet<QUmlInputPin *> QUmlOpaqueAction::inputValue() const { // This is a read-write association end - QM_D(const QUmlOpaqueAction); - return d->inputValue; + return _inputValue; } void QUmlOpaqueAction::addInputValue(QUmlInputPin *inputValue) { // This is a read-write association end - QM_D(QUmlOpaqueAction); - if (!d->inputValue.contains(inputValue)) { - d->inputValue.insert(inputValue); + if (!_inputValue.contains(inputValue)) { + _inputValue.insert(inputValue); } } @@ -123,9 +110,8 @@ void QUmlOpaqueAction::removeInputValue(QUmlInputPin *inputValue) { // This is a read-write association end - QM_D(QUmlOpaqueAction); - if (d->inputValue.contains(inputValue)) { - d->inputValue.remove(inputValue); + if (_inputValue.contains(inputValue)) { + _inputValue.remove(inputValue); } } @@ -136,17 +122,15 @@ QList<QString> QUmlOpaqueAction::language() const { // This is a read-write property - QM_D(const QUmlOpaqueAction); - return d->language; + return _language; } void QUmlOpaqueAction::addLanguage(QString language) { // This is a read-write property - QM_D(QUmlOpaqueAction); - if (!d->language.contains(language)) { - d->language.append(language); + if (!_language.contains(language)) { + _language.append(language); } } @@ -154,9 +138,8 @@ void QUmlOpaqueAction::removeLanguage(QString language) { // This is a read-write property - QM_D(QUmlOpaqueAction); - if (d->language.contains(language)) { - d->language.removeAll(language); + if (_language.contains(language)) { + _language.removeAll(language); } } @@ -167,17 +150,15 @@ QSet<QUmlOutputPin *> QUmlOpaqueAction::outputValue() const { // This is a read-write association end - QM_D(const QUmlOpaqueAction); - return d->outputValue; + return _outputValue; } void QUmlOpaqueAction::addOutputValue(QUmlOutputPin *outputValue) { // This is a read-write association end - QM_D(QUmlOpaqueAction); - if (!d->outputValue.contains(outputValue)) { - d->outputValue.insert(outputValue); + if (!_outputValue.contains(outputValue)) { + _outputValue.insert(outputValue); } } @@ -185,9 +166,8 @@ void QUmlOpaqueAction::removeOutputValue(QUmlOutputPin *outputValue) { // This is a read-write association end - QM_D(QUmlOpaqueAction); - if (d->outputValue.contains(outputValue)) { - d->outputValue.remove(outputValue); + if (_outputValue.contains(outputValue)) { + _outputValue.remove(outputValue); } } diff --git a/src/uml/qumlopaqueaction.h b/src/uml/qumlopaqueaction.h index cd2ead6f..2db85b8f 100644 --- a/src/uml/qumlopaqueaction.h +++ b/src/uml/qumlopaqueaction.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlOutputPin; -class QUmlOpaqueActionPrivate; class Q_UML_EXPORT QUmlOpaqueAction : public QUmlAction { public: - QUmlOpaqueAction(bool create_d_ptr = true); + QUmlOpaqueAction(); // Owned attributes QList<QString> body() const; @@ -73,6 +72,12 @@ public: QSet<QUmlOutputPin *> outputValue() const; void addOutputValue(QUmlOutputPin *outputValue); void removeOutputValue(QUmlOutputPin *outputValue); + +protected: + QList<QString> _body; + QSet<QUmlInputPin *> _inputValue; + QList<QString> _language; + QSet<QUmlOutputPin *> _outputValue; }; QT_END_NAMESPACE diff --git a/src/uml/qumlopaqueaction_p.h b/src/uml/qumlopaqueaction_p.h deleted file mode 100644 index c630ab33..00000000 --- a/src/uml/qumlopaqueaction_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOPAQUEACTION_P_H -#define QUMLOPAQUEACTION_P_H - -#include "QtUml/QUmlOpaqueAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlOpaqueActionPrivate : public QUmlActionPrivate -{ -public: - QUmlOpaqueActionPrivate(); - - QList<QString> body; - QSet<QUmlInputPin *> inputValue; - QList<QString> language; - QSet<QUmlOutputPin *> outputValue; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOPAQUEACTION_P_H - diff --git a/src/uml/qumlopaquebehavior.cpp b/src/uml/qumlopaquebehavior.cpp index e4ba48d0..e32a2376 100644 --- a/src/uml/qumlopaquebehavior.cpp +++ b/src/uml/qumlopaquebehavior.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlopaquebehavior.h" -#include "qumlopaquebehavior_p.h" QT_BEGIN_NAMESPACE -QUmlOpaqueBehaviorPrivate::QUmlOpaqueBehaviorPrivate() -{ -} - /*! \class QUmlOpaqueBehavior @@ -55,11 +50,8 @@ QUmlOpaqueBehaviorPrivate::QUmlOpaqueBehaviorPrivate() \brief An behavior with implementation-specific semantics. */ -QUmlOpaqueBehavior::QUmlOpaqueBehavior(bool create_d_ptr) : - QUmlBehavior(false) +QUmlOpaqueBehavior::QUmlOpaqueBehavior() { - if (create_d_ptr) - set_d_ptr(new QUmlOpaqueBehaviorPrivate); } // OWNED ATTRIBUTES @@ -71,17 +63,15 @@ QList<QString> QUmlOpaqueBehavior::body() const { // This is a read-write property - QM_D(const QUmlOpaqueBehavior); - return d->body; + return _body; } void QUmlOpaqueBehavior::addBody(QString body) { // This is a read-write property - QM_D(QUmlOpaqueBehavior); - if (!d->body.contains(body)) { - d->body.append(body); + if (!_body.contains(body)) { + _body.append(body); } } @@ -89,9 +79,8 @@ void QUmlOpaqueBehavior::removeBody(QString body) { // This is a read-write property - QM_D(QUmlOpaqueBehavior); - if (d->body.contains(body)) { - d->body.removeAll(body); + if (_body.contains(body)) { + _body.removeAll(body); } } @@ -102,17 +91,15 @@ QList<QString> QUmlOpaqueBehavior::language() const { // This is a read-write property - QM_D(const QUmlOpaqueBehavior); - return d->language; + return _language; } void QUmlOpaqueBehavior::addLanguage(QString language) { // This is a read-write property - QM_D(QUmlOpaqueBehavior); - if (!d->language.contains(language)) { - d->language.append(language); + if (!_language.contains(language)) { + _language.append(language); } } @@ -120,9 +107,8 @@ void QUmlOpaqueBehavior::removeLanguage(QString language) { // This is a read-write property - QM_D(QUmlOpaqueBehavior); - if (d->language.contains(language)) { - d->language.removeAll(language); + if (_language.contains(language)) { + _language.removeAll(language); } } diff --git a/src/uml/qumlopaquebehavior.h b/src/uml/qumlopaquebehavior.h index 109b4146..a1cdc435 100644 --- a/src/uml/qumlopaquebehavior.h +++ b/src/uml/qumlopaquebehavior.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlOpaqueBehaviorPrivate; class Q_UML_EXPORT QUmlOpaqueBehavior : public QUmlBehavior { public: - QUmlOpaqueBehavior(bool create_d_ptr = true); + QUmlOpaqueBehavior(); // Owned attributes QList<QString> body() const; @@ -64,6 +63,10 @@ public: QList<QString> language() const; void addLanguage(QString language); void removeLanguage(QString language); + +protected: + QList<QString> _body; + QList<QString> _language; }; QT_END_NAMESPACE diff --git a/src/uml/qumlopaquebehavior_p.h b/src/uml/qumlopaquebehavior_p.h deleted file mode 100644 index 95d36469..00000000 --- a/src/uml/qumlopaquebehavior_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOPAQUEBEHAVIOR_P_H -#define QUMLOPAQUEBEHAVIOR_P_H - -#include "QtUml/QUmlOpaqueBehavior" - -#include "private/qumlbehavior_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlOpaqueBehaviorPrivate : public QUmlBehaviorPrivate -{ -public: - QUmlOpaqueBehaviorPrivate(); - - QList<QString> body; - QList<QString> language; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOPAQUEBEHAVIOR_P_H - diff --git a/src/uml/qumlopaqueexpression.cpp b/src/uml/qumlopaqueexpression.cpp index d42a4f79..d07d13c8 100644 --- a/src/uml/qumlopaqueexpression.cpp +++ b/src/uml/qumlopaqueexpression.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlopaqueexpression.h" -#include "qumlopaqueexpression_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlParameter> QT_BEGIN_NAMESPACE -QUmlOpaqueExpressionPrivate::QUmlOpaqueExpressionPrivate() : - behavior(0) -{ -} - /*! \class QUmlOpaqueExpression @@ -59,11 +53,9 @@ QUmlOpaqueExpressionPrivate::QUmlOpaqueExpressionPrivate() : \brief An opaque expression is an uninterpreted textual statement that denotes a (possibly empty) set of values when evaluated in a context.Provides a mechanism for precisely defining the behavior of an opaque expression. An opaque expression is defined by a behavior restricted to return one result. */ -QUmlOpaqueExpression::QUmlOpaqueExpression(bool create_d_ptr) : - QUmlValueSpecification(false) +QUmlOpaqueExpression::QUmlOpaqueExpression() : + _behavior(0) { - if (create_d_ptr) - set_d_ptr(new QUmlOpaqueExpressionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlBehavior *QUmlOpaqueExpression::behavior() const { // This is a read-write association end - QM_D(const QUmlOpaqueExpression); - return d->behavior; + return _behavior; } void QUmlOpaqueExpression::setBehavior(QUmlBehavior *behavior) { // This is a read-write association end - QM_D(QUmlOpaqueExpression); - if (d->behavior != behavior) { - d->behavior = behavior; + if (_behavior != behavior) { + _behavior = behavior; } } @@ -96,17 +86,15 @@ QList<QString> QUmlOpaqueExpression::body() const { // This is a read-write property - QM_D(const QUmlOpaqueExpression); - return d->body; + return _body; } void QUmlOpaqueExpression::addBody(QString body) { // This is a read-write property - QM_D(QUmlOpaqueExpression); - if (!d->body.contains(body)) { - d->body.append(body); + if (!_body.contains(body)) { + _body.append(body); } } @@ -114,9 +102,8 @@ void QUmlOpaqueExpression::removeBody(QString body) { // This is a read-write property - QM_D(QUmlOpaqueExpression); - if (d->body.contains(body)) { - d->body.removeAll(body); + if (_body.contains(body)) { + _body.removeAll(body); } } @@ -127,17 +114,15 @@ QList<QString> QUmlOpaqueExpression::language() const { // This is a read-write property - QM_D(const QUmlOpaqueExpression); - return d->language; + return _language; } void QUmlOpaqueExpression::addLanguage(QString language) { // This is a read-write property - QM_D(QUmlOpaqueExpression); - if (!d->language.contains(language)) { - d->language.append(language); + if (!_language.contains(language)) { + _language.append(language); } } @@ -145,9 +130,8 @@ void QUmlOpaqueExpression::removeLanguage(QString language) { // This is a read-write property - QM_D(QUmlOpaqueExpression); - if (d->language.contains(language)) { - d->language.removeAll(language); + if (_language.contains(language)) { + _language.removeAll(language); } } diff --git a/src/uml/qumlopaqueexpression.h b/src/uml/qumlopaqueexpression.h index f35d801d..ef93f1f8 100644 --- a/src/uml/qumlopaqueexpression.h +++ b/src/uml/qumlopaqueexpression.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlBehavior; class QUmlParameter; -class QUmlOpaqueExpressionPrivate; class Q_UML_EXPORT QUmlOpaqueExpression : public QUmlValueSpecification { public: - QUmlOpaqueExpression(bool create_d_ptr = true); + QUmlOpaqueExpression(); // Owned attributes QUmlBehavior *behavior() const; @@ -76,6 +75,11 @@ public: bool isNonNegative() const; bool isPositive() const; int value() const; + +protected: + QUmlBehavior *_behavior; + QList<QString> _body; + QList<QString> _language; }; QT_END_NAMESPACE diff --git a/src/uml/qumlopaqueexpression_p.h b/src/uml/qumlopaqueexpression_p.h deleted file mode 100644 index dcfde37a..00000000 --- a/src/uml/qumlopaqueexpression_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOPAQUEEXPRESSION_P_H -#define QUMLOPAQUEEXPRESSION_P_H - -#include "QtUml/QUmlOpaqueExpression" - -#include "private/qumlvaluespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlOpaqueExpressionPrivate : public QUmlValueSpecificationPrivate -{ -public: - QUmlOpaqueExpressionPrivate(); - - QUmlBehavior *behavior; - QList<QString> body; - QList<QString> language; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOPAQUEEXPRESSION_P_H - diff --git a/src/uml/qumloperation.cpp b/src/uml/qumloperation.cpp index d8315beb..7c023476 100644 --- a/src/uml/qumloperation.cpp +++ b/src/uml/qumloperation.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumloperation.h" -#include "qumloperation_p.h" #include <QtUml/QUmlClass> #include <QtUml/QUmlConstraint> @@ -51,16 +50,6 @@ QT_BEGIN_NAMESPACE -QUmlOperationPrivate::QUmlOperationPrivate() : - bodyCondition(0), - class_(0), - datatype(0), - interface_(0), - isQuery(false), - templateParameter(0) -{ -} - /*! \class QUmlOperation @@ -69,13 +58,14 @@ QUmlOperationPrivate::QUmlOperationPrivate() : \brief An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior.An operation may invoke both the execution of method behaviors as well as other behavioral responses.Operation specializes TemplateableElement in order to support specification of template operations and bound operations. Operation specializes ParameterableElement to specify that an operation can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template. */ -QUmlOperation::QUmlOperation(bool create_d_ptr) : - QUmlTemplateableElement(false), - QUmlBehavioralFeature(false), - QUmlParameterableElement(false) +QUmlOperation::QUmlOperation() : + _bodyCondition(0), + _class_(0), + _datatype(0), + _interface_(0), + _isQuery(false), + _templateParameter(0) { - if (create_d_ptr) - set_d_ptr(new QUmlOperationPrivate); } // OWNED ATTRIBUTES @@ -87,17 +77,15 @@ QUmlConstraint *QUmlOperation::bodyCondition() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->bodyCondition; + return _bodyCondition; } void QUmlOperation::setBodyCondition(QUmlConstraint *bodyCondition) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->bodyCondition != bodyCondition) { - d->bodyCondition = bodyCondition; + if (_bodyCondition != bodyCondition) { + _bodyCondition = bodyCondition; } } @@ -108,17 +96,15 @@ QUmlClass *QUmlOperation::class_() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->class_; + return _class_; } void QUmlOperation::setClass(QUmlClass *class_) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->class_ != class_) { - d->class_ = class_; + if (_class_ != class_) { + _class_ = class_; } } @@ -129,17 +115,15 @@ QUmlDataType *QUmlOperation::datatype() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->datatype; + return _datatype; } void QUmlOperation::setDatatype(QUmlDataType *datatype) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->datatype != datatype) { - d->datatype = datatype; + if (_datatype != datatype) { + _datatype = datatype; } } @@ -150,17 +134,15 @@ QUmlInterface *QUmlOperation::interface_() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->interface_; + return _interface_; } void QUmlOperation::setInterface(QUmlInterface *interface_) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->interface_ != interface_) { - d->interface_ = interface_; + if (_interface_ != interface_) { + _interface_ = interface_; } } @@ -183,17 +165,15 @@ bool QUmlOperation::isQuery() const { // This is a read-write property - QM_D(const QUmlOperation); - return d->isQuery; + return _isQuery; } void QUmlOperation::setQuery(bool isQuery) { // This is a read-write property - QM_D(QUmlOperation); - if (d->isQuery != isQuery) { - d->isQuery = isQuery; + if (_isQuery != isQuery) { + _isQuery = isQuery; } } @@ -228,17 +208,15 @@ QList<QUmlParameter *> QUmlOperation::ownedParameter() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->ownedParameter; + return _ownedParameter; } void QUmlOperation::addOwnedParameter(QUmlParameter *ownedParameter) { // This is a read-write association end - QM_D(QUmlOperation); - if (!d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.append(ownedParameter); + if (!_ownedParameter.contains(ownedParameter)) { + _ownedParameter.append(ownedParameter); } } @@ -246,9 +224,8 @@ void QUmlOperation::removeOwnedParameter(QUmlParameter *ownedParameter) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.removeAll(ownedParameter); + if (_ownedParameter.contains(ownedParameter)) { + _ownedParameter.removeAll(ownedParameter); } } @@ -259,17 +236,15 @@ QSet<QUmlConstraint *> QUmlOperation::postcondition() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->postcondition; + return _postcondition; } void QUmlOperation::addPostcondition(QUmlConstraint *postcondition) { // This is a read-write association end - QM_D(QUmlOperation); - if (!d->postcondition.contains(postcondition)) { - d->postcondition.insert(postcondition); + if (!_postcondition.contains(postcondition)) { + _postcondition.insert(postcondition); } } @@ -277,9 +252,8 @@ void QUmlOperation::removePostcondition(QUmlConstraint *postcondition) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->postcondition.contains(postcondition)) { - d->postcondition.remove(postcondition); + if (_postcondition.contains(postcondition)) { + _postcondition.remove(postcondition); } } @@ -290,17 +264,15 @@ QSet<QUmlConstraint *> QUmlOperation::precondition() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->precondition; + return _precondition; } void QUmlOperation::addPrecondition(QUmlConstraint *precondition) { // This is a read-write association end - QM_D(QUmlOperation); - if (!d->precondition.contains(precondition)) { - d->precondition.insert(precondition); + if (!_precondition.contains(precondition)) { + _precondition.insert(precondition); } } @@ -308,9 +280,8 @@ void QUmlOperation::removePrecondition(QUmlConstraint *precondition) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->precondition.contains(precondition)) { - d->precondition.remove(precondition); + if (_precondition.contains(precondition)) { + _precondition.remove(precondition); } } @@ -321,17 +292,15 @@ QSet<QUmlType *> QUmlOperation::raisedException() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->raisedException; + return _raisedException; } void QUmlOperation::addRaisedException(QUmlType *raisedException) { // This is a read-write association end - QM_D(QUmlOperation); - if (!d->raisedException.contains(raisedException)) { - d->raisedException.insert(raisedException); + if (!_raisedException.contains(raisedException)) { + _raisedException.insert(raisedException); } } @@ -339,9 +308,8 @@ void QUmlOperation::removeRaisedException(QUmlType *raisedException) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->raisedException.contains(raisedException)) { - d->raisedException.remove(raisedException); + if (_raisedException.contains(raisedException)) { + _raisedException.remove(raisedException); } } @@ -352,17 +320,15 @@ QSet<QUmlOperation *> QUmlOperation::redefinedOperation() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->redefinedOperation; + return _redefinedOperation; } void QUmlOperation::addRedefinedOperation(QUmlOperation *redefinedOperation) { // This is a read-write association end - QM_D(QUmlOperation); - if (!d->redefinedOperation.contains(redefinedOperation)) { - d->redefinedOperation.insert(redefinedOperation); + if (!_redefinedOperation.contains(redefinedOperation)) { + _redefinedOperation.insert(redefinedOperation); } } @@ -370,9 +336,8 @@ void QUmlOperation::removeRedefinedOperation(QUmlOperation *redefinedOperation) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->redefinedOperation.contains(redefinedOperation)) { - d->redefinedOperation.remove(redefinedOperation); + if (_redefinedOperation.contains(redefinedOperation)) { + _redefinedOperation.remove(redefinedOperation); } } @@ -383,17 +348,15 @@ QUmlOperationTemplateParameter *QUmlOperation::templateParameter() const { // This is a read-write association end - QM_D(const QUmlOperation); - return d->templateParameter; + return _templateParameter; } void QUmlOperation::setTemplateParameter(QUmlOperationTemplateParameter *templateParameter) { // This is a read-write association end - QM_D(QUmlOperation); - if (d->templateParameter != templateParameter) { - d->templateParameter = templateParameter; + if (_templateParameter != templateParameter) { + _templateParameter = templateParameter; } } diff --git a/src/uml/qumloperation.h b/src/uml/qumloperation.h index 411089c1..92681dd4 100644 --- a/src/uml/qumloperation.h +++ b/src/uml/qumloperation.h @@ -61,11 +61,10 @@ class QUmlOperationTemplateParameter; class QUmlRedefinableElement; class QUmlType; -class QUmlOperationPrivate; class Q_UML_EXPORT QUmlOperation : public QUmlTemplateableElement, public QUmlBehavioralFeature, public QUmlParameterableElement { public: - QUmlOperation(bool create_d_ptr = true); + QUmlOperation(); // Owned attributes QUmlConstraint *bodyCondition() const; @@ -104,6 +103,19 @@ public: // Operations bool isConsistentWith(QUmlRedefinableElement *redefinee) const; QSet<QUmlParameter *> returnResult() const; + +protected: + QUmlConstraint *_bodyCondition; + QUmlClass *_class_; + QUmlDataType *_datatype; + QUmlInterface *_interface_; + bool _isQuery; + QList<QUmlParameter *> _ownedParameter; + QSet<QUmlConstraint *> _postcondition; + QSet<QUmlConstraint *> _precondition; + QSet<QUmlType *> _raisedException; + QSet<QUmlOperation *> _redefinedOperation; + QUmlOperationTemplateParameter *_templateParameter; }; QT_END_NAMESPACE diff --git a/src/uml/qumloperation_p.h b/src/uml/qumloperation_p.h deleted file mode 100644 index 6ea1c3cc..00000000 --- a/src/uml/qumloperation_p.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOPERATION_P_H -#define QUMLOPERATION_P_H - -#include "QtUml/QUmlOperation" - -#include "private/qumltemplateableelement_p.h" -#include "private/qumlbehavioralfeature_p.h" -#include "private/qumlparameterableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlOperationPrivate : public QUmlTemplateableElementPrivate, public QUmlBehavioralFeaturePrivate, public QUmlParameterableElementPrivate -{ -public: - QUmlOperationPrivate(); - - QUmlConstraint *bodyCondition; - QUmlClass *class_; - QUmlDataType *datatype; - QUmlInterface *interface_; - bool isQuery; - QList<QUmlParameter *> ownedParameter; - QSet<QUmlConstraint *> postcondition; - QSet<QUmlConstraint *> precondition; - QSet<QUmlType *> raisedException; - QSet<QUmlOperation *> redefinedOperation; - QUmlOperationTemplateParameter *templateParameter; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOPERATION_P_H - diff --git a/src/uml/qumloperationtemplateparameter.cpp b/src/uml/qumloperationtemplateparameter.cpp index b037f182..38212a32 100644 --- a/src/uml/qumloperationtemplateparameter.cpp +++ b/src/uml/qumloperationtemplateparameter.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumloperationtemplateparameter.h" -#include "qumloperationtemplateparameter_p.h" #include <QtUml/QUmlOperation> QT_BEGIN_NAMESPACE -QUmlOperationTemplateParameterPrivate::QUmlOperationTemplateParameterPrivate() : - parameteredElement(0) -{ -} - /*! \class QUmlOperationTemplateParameter @@ -58,11 +52,9 @@ QUmlOperationTemplateParameterPrivate::QUmlOperationTemplateParameterPrivate() : \brief An operation template parameter exposes an operation as a formal parameter for a template. */ -QUmlOperationTemplateParameter::QUmlOperationTemplateParameter(bool create_d_ptr) : - QUmlTemplateParameter(false) +QUmlOperationTemplateParameter::QUmlOperationTemplateParameter() : + _parameteredElement(0) { - if (create_d_ptr) - set_d_ptr(new QUmlOperationTemplateParameterPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOperation *QUmlOperationTemplateParameter::parameteredElement() const { // This is a read-write association end - QM_D(const QUmlOperationTemplateParameter); - return d->parameteredElement; + return _parameteredElement; } void QUmlOperationTemplateParameter::setParameteredElement(QUmlOperation *parameteredElement) { // This is a read-write association end - QM_D(QUmlOperationTemplateParameter); - if (d->parameteredElement != parameteredElement) { - d->parameteredElement = parameteredElement; + if (_parameteredElement != parameteredElement) { + _parameteredElement = parameteredElement; } } diff --git a/src/uml/qumloperationtemplateparameter.h b/src/uml/qumloperationtemplateparameter.h index bf06929d..f2f5021e 100644 --- a/src/uml/qumloperationtemplateparameter.h +++ b/src/uml/qumloperationtemplateparameter.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOperation; -class QUmlOperationTemplateParameterPrivate; class Q_UML_EXPORT QUmlOperationTemplateParameter : public QUmlTemplateParameter { public: - QUmlOperationTemplateParameter(bool create_d_ptr = true); + QUmlOperationTemplateParameter(); // Owned attributes QUmlOperation *parameteredElement() const; void setParameteredElement(QUmlOperation *parameteredElement); + +protected: + QUmlOperation *_parameteredElement; }; QT_END_NAMESPACE diff --git a/src/uml/qumloperationtemplateparameter_p.h b/src/uml/qumloperationtemplateparameter_p.h deleted file mode 100644 index 2ea4dc7a..00000000 --- a/src/uml/qumloperationtemplateparameter_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOPERATIONTEMPLATEPARAMETER_P_H -#define QUMLOPERATIONTEMPLATEPARAMETER_P_H - -#include "QtUml/QUmlOperationTemplateParameter" - -#include "private/qumltemplateparameter_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlOperationTemplateParameterPrivate : public QUmlTemplateParameterPrivate -{ -public: - QUmlOperationTemplateParameterPrivate(); - - QUmlOperation *parameteredElement; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOPERATIONTEMPLATEPARAMETER_P_H - diff --git a/src/uml/qumloutputpin.cpp b/src/uml/qumloutputpin.cpp index 3be0c37b..e7c80642 100644 --- a/src/uml/qumloutputpin.cpp +++ b/src/uml/qumloutputpin.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumloutputpin.h" -#include "qumloutputpin_p.h" QT_BEGIN_NAMESPACE -QUmlOutputPinPrivate::QUmlOutputPinPrivate() -{ -} - /*! \class QUmlOutputPin @@ -55,11 +50,8 @@ QUmlOutputPinPrivate::QUmlOutputPinPrivate() \brief An output pin is a pin that holds output values produced by an action. */ -QUmlOutputPin::QUmlOutputPin(bool create_d_ptr) : - QUmlPin(false) +QUmlOutputPin::QUmlOutputPin() { - if (create_d_ptr) - set_d_ptr(new QUmlOutputPinPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumloutputpin.h b/src/uml/qumloutputpin.h index c65d8742..ba33a069 100644 --- a/src/uml/qumloutputpin.h +++ b/src/uml/qumloutputpin.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlOutputPinPrivate; class Q_UML_EXPORT QUmlOutputPin : public QUmlPin { public: - QUmlOutputPin(bool create_d_ptr = true); + QUmlOutputPin(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumloutputpin_p.h b/src/uml/qumloutputpin_p.h deleted file mode 100644 index 24e9d174..00000000 --- a/src/uml/qumloutputpin_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLOUTPUTPIN_P_H -#define QUMLOUTPUTPIN_P_H - -#include "QtUml/QUmlOutputPin" - -#include "private/qumlpin_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlOutputPinPrivate : public QUmlPinPrivate -{ -public: - QUmlOutputPinPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLOUTPUTPIN_P_H - diff --git a/src/uml/qumlpackage.cpp b/src/uml/qumlpackage.cpp index 62318ac4..10c42448 100644 --- a/src/uml/qumlpackage.cpp +++ b/src/uml/qumlpackage.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlpackage.h" -#include "qumlpackage_p.h" #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlPackageMerge> @@ -50,11 +49,6 @@ QT_BEGIN_NAMESPACE -QUmlPackagePrivate::QUmlPackagePrivate() : - nestingPackage(0) -{ -} - /*! \class QUmlPackage @@ -63,13 +57,9 @@ QUmlPackagePrivate::QUmlPackagePrivate() : \brief A package can have one or more profile applications to indicate which profiles have been applied. Because a profile is a package, it is possible to apply a profile not only to packages, but also to profiles.Package specializes TemplateableElement and PackageableElement specializes ParameterableElement to specify that a package can be used as a template and a PackageableElement as a template parameter.A package is used to group elements, and provides a namespace for the grouped elements. */ -QUmlPackage::QUmlPackage(bool create_d_ptr) : - QUmlNamespace(false), - QUmlPackageableElement(false), - QUmlTemplateableElement(false) +QUmlPackage::QUmlPackage() : + _nestingPackage(0) { - if (create_d_ptr) - set_d_ptr(new QUmlPackagePrivate); } // OWNED ATTRIBUTES @@ -81,17 +71,15 @@ QString QUmlPackage::URI() const { // This is a read-write property - QM_D(const QUmlPackage); - return d->URI; + return _URI; } void QUmlPackage::setURI(QString URI) { // This is a read-write property - QM_D(QUmlPackage); - if (d->URI != URI) { - d->URI = URI; + if (_URI != URI) { + _URI = URI; } } @@ -138,17 +126,15 @@ QUmlPackage *QUmlPackage::nestingPackage() const { // This is a read-write association end - QM_D(const QUmlPackage); - return d->nestingPackage; + return _nestingPackage; } void QUmlPackage::setNestingPackage(QUmlPackage *nestingPackage) { // This is a read-write association end - QM_D(QUmlPackage); - if (d->nestingPackage != nestingPackage) { - d->nestingPackage = nestingPackage; + if (_nestingPackage != nestingPackage) { + _nestingPackage = nestingPackage; } } @@ -207,17 +193,15 @@ QSet<QUmlPackageMerge *> QUmlPackage::packageMerge() const { // This is a read-write association end - QM_D(const QUmlPackage); - return d->packageMerge; + return _packageMerge; } void QUmlPackage::addPackageMerge(QUmlPackageMerge *packageMerge) { // This is a read-write association end - QM_D(QUmlPackage); - if (!d->packageMerge.contains(packageMerge)) { - d->packageMerge.insert(packageMerge); + if (!_packageMerge.contains(packageMerge)) { + _packageMerge.insert(packageMerge); } } @@ -225,9 +209,8 @@ void QUmlPackage::removePackageMerge(QUmlPackageMerge *packageMerge) { // This is a read-write association end - QM_D(QUmlPackage); - if (d->packageMerge.contains(packageMerge)) { - d->packageMerge.remove(packageMerge); + if (_packageMerge.contains(packageMerge)) { + _packageMerge.remove(packageMerge); } } @@ -238,17 +221,15 @@ QSet<QUmlPackageableElement *> QUmlPackage::packagedElement() const { // This is a read-write association end - QM_D(const QUmlPackage); - return d->packagedElement; + return _packagedElement; } void QUmlPackage::addPackagedElement(QUmlPackageableElement *packagedElement) { // This is a read-write association end - QM_D(QUmlPackage); - if (!d->packagedElement.contains(packagedElement)) { - d->packagedElement.insert(packagedElement); + if (!_packagedElement.contains(packagedElement)) { + _packagedElement.insert(packagedElement); } } @@ -256,9 +237,8 @@ void QUmlPackage::removePackagedElement(QUmlPackageableElement *packagedElement) { // This is a read-write association end - QM_D(QUmlPackage); - if (d->packagedElement.contains(packagedElement)) { - d->packagedElement.remove(packagedElement); + if (_packagedElement.contains(packagedElement)) { + _packagedElement.remove(packagedElement); } } @@ -269,17 +249,15 @@ QSet<QUmlProfileApplication *> QUmlPackage::profileApplication() const { // This is a read-write association end - QM_D(const QUmlPackage); - return d->profileApplication; + return _profileApplication; } void QUmlPackage::addProfileApplication(QUmlProfileApplication *profileApplication) { // This is a read-write association end - QM_D(QUmlPackage); - if (!d->profileApplication.contains(profileApplication)) { - d->profileApplication.insert(profileApplication); + if (!_profileApplication.contains(profileApplication)) { + _profileApplication.insert(profileApplication); } } @@ -287,9 +265,8 @@ void QUmlPackage::removeProfileApplication(QUmlProfileApplication *profileApplic { // This is a read-write association end - QM_D(QUmlPackage); - if (d->profileApplication.contains(profileApplication)) { - d->profileApplication.remove(profileApplication); + if (_profileApplication.contains(profileApplication)) { + _profileApplication.remove(profileApplication); } } diff --git a/src/uml/qumlpackage.h b/src/uml/qumlpackage.h index 64768529..ac5e2eba 100644 --- a/src/uml/qumlpackage.h +++ b/src/uml/qumlpackage.h @@ -60,11 +60,10 @@ class QUmlProfileApplication; class QUmlStereotype; class QUmlType; -class QUmlPackagePrivate; class Q_UML_EXPORT QUmlPackage : public QUmlNamespace, public QUmlPackageableElement, public QUmlTemplateableElement { public: - QUmlPackage(bool create_d_ptr = true); + QUmlPackage(); // Owned attributes QString URI() const; @@ -94,6 +93,13 @@ public: bool makesVisible(QUmlNamedElement *el) const; bool mustBeOwned() const; QSet<QUmlPackageableElement *> visibleMembers() const; + +protected: + QString _URI; + QUmlPackage *_nestingPackage; + QSet<QUmlPackageMerge *> _packageMerge; + QSet<QUmlPackageableElement *> _packagedElement; + QSet<QUmlProfileApplication *> _profileApplication; }; QT_END_NAMESPACE diff --git a/src/uml/qumlpackage_p.h b/src/uml/qumlpackage_p.h deleted file mode 100644 index e3c6df84..00000000 --- a/src/uml/qumlpackage_p.h +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPACKAGE_P_H -#define QUMLPACKAGE_P_H - -#include "QtUml/QUmlPackage" - -#include "private/qumlnamespace_p.h" -#include "private/qumlpackageableelement_p.h" -#include "private/qumltemplateableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPackagePrivate : public QUmlNamespacePrivate, public QUmlPackageableElementPrivate, public QUmlTemplateableElementPrivate -{ -public: - QUmlPackagePrivate(); - - QString URI; - QUmlPackage *nestingPackage; - QSet<QUmlPackageMerge *> packageMerge; - QSet<QUmlPackageableElement *> packagedElement; - QSet<QUmlProfileApplication *> profileApplication; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPACKAGE_P_H - diff --git a/src/uml/qumlpackageableelement.cpp b/src/uml/qumlpackageableelement.cpp index 0be00b79..d0dabee5 100644 --- a/src/uml/qumlpackageableelement.cpp +++ b/src/uml/qumlpackageableelement.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlpackageableelement.h" -#include "qumlpackageableelement_p.h" QT_BEGIN_NAMESPACE -QUmlPackageableElementPrivate::QUmlPackageableElementPrivate() : - visibility(QtUml::VisibilityPublic) -{ -} - /*! \class QUmlPackageableElement @@ -56,12 +50,9 @@ QUmlPackageableElementPrivate::QUmlPackageableElementPrivate() : \brief Packageable elements are able to serve as a template parameter.A packageable element indicates a named element that may be owned directly by a package. */ -QUmlPackageableElement::QUmlPackageableElement(bool create_d_ptr) : - QUmlNamedElement(false), - QUmlParameterableElement(false) +QUmlPackageableElement::QUmlPackageableElement() : + _visibility(QtUml::VisibilityPublic) { - if (create_d_ptr) - set_d_ptr(new QUmlPackageableElementPrivate); } // OWNED ATTRIBUTES @@ -73,17 +64,15 @@ QtUml::VisibilityKind QUmlPackageableElement::visibility() const { // This is a read-write property - QM_D(const QUmlPackageableElement); - return d->visibility; + return _visibility; } void QUmlPackageableElement::setVisibility(QtUml::VisibilityKind visibility) { // This is a read-write property - QM_D(QUmlPackageableElement); - if (d->visibility != visibility) { - d->visibility = visibility; + if (_visibility != visibility) { + _visibility = visibility; } } diff --git a/src/uml/qumlpackageableelement.h b/src/uml/qumlpackageableelement.h index 265df9fb..f64849a7 100644 --- a/src/uml/qumlpackageableelement.h +++ b/src/uml/qumlpackageableelement.h @@ -53,15 +53,17 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlPackageableElementPrivate; class Q_UML_EXPORT QUmlPackageableElement : public virtual QUmlNamedElement, public QUmlParameterableElement { public: - Q_DECL_HIDDEN QUmlPackageableElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlPackageableElement(); // Owned attributes QtUml::VisibilityKind visibility() const; void setVisibility(QtUml::VisibilityKind visibility); + +protected: + QtUml::VisibilityKind _visibility; }; QT_END_NAMESPACE diff --git a/src/uml/qumlpackageableelement_p.h b/src/uml/qumlpackageableelement_p.h deleted file mode 100644 index 29446ca7..00000000 --- a/src/uml/qumlpackageableelement_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPACKAGEABLEELEMENT_P_H -#define QUMLPACKAGEABLEELEMENT_P_H - -#include "QtUml/QUmlPackageableElement" - -#include "private/qumlparameterableelement_p.h" -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPackageableElementPrivate : public virtual QUmlNamedElementPrivate, public QUmlParameterableElementPrivate -{ -public: - QUmlPackageableElementPrivate(); - - QtUml::VisibilityKind visibility; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPACKAGEABLEELEMENT_P_H - diff --git a/src/uml/qumlpackageimport.cpp b/src/uml/qumlpackageimport.cpp index f59acde1..8ba773f3 100644 --- a/src/uml/qumlpackageimport.cpp +++ b/src/uml/qumlpackageimport.cpp @@ -39,20 +39,12 @@ ** ****************************************************************************/ #include "qumlpackageimport.h" -#include "qumlpackageimport_p.h" #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> QT_BEGIN_NAMESPACE -QUmlPackageImportPrivate::QUmlPackageImportPrivate() : - importedPackage(0), - importingNamespace(0), - visibility(QtUml::VisibilityPublic) -{ -} - /*! \class QUmlPackageImport @@ -61,11 +53,11 @@ QUmlPackageImportPrivate::QUmlPackageImportPrivate() : \brief A package import is a relationship that allows the use of unqualified names to refer to package members from other namespaces. */ -QUmlPackageImport::QUmlPackageImport(bool create_d_ptr) : - QUmlDirectedRelationship(false) +QUmlPackageImport::QUmlPackageImport() : + _importedPackage(0), + _importingNamespace(0), + _visibility(QtUml::VisibilityPublic) { - if (create_d_ptr) - set_d_ptr(new QUmlPackageImportPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlPackage *QUmlPackageImport::importedPackage() const { // This is a read-write association end - QM_D(const QUmlPackageImport); - return d->importedPackage; + return _importedPackage; } void QUmlPackageImport::setImportedPackage(QUmlPackage *importedPackage) { // This is a read-write association end - QM_D(QUmlPackageImport); - if (d->importedPackage != importedPackage) { - d->importedPackage = importedPackage; + if (_importedPackage != importedPackage) { + _importedPackage = importedPackage; } } @@ -98,17 +88,15 @@ QUmlNamespace *QUmlPackageImport::importingNamespace() const { // This is a read-write association end - QM_D(const QUmlPackageImport); - return d->importingNamespace; + return _importingNamespace; } void QUmlPackageImport::setImportingNamespace(QUmlNamespace *importingNamespace) { // This is a read-write association end - QM_D(QUmlPackageImport); - if (d->importingNamespace != importingNamespace) { - d->importingNamespace = importingNamespace; + if (_importingNamespace != importingNamespace) { + _importingNamespace = importingNamespace; } } @@ -119,17 +107,15 @@ QtUml::VisibilityKind QUmlPackageImport::visibility() const { // This is a read-write property - QM_D(const QUmlPackageImport); - return d->visibility; + return _visibility; } void QUmlPackageImport::setVisibility(QtUml::VisibilityKind visibility) { // This is a read-write property - QM_D(QUmlPackageImport); - if (d->visibility != visibility) { - d->visibility = visibility; + if (_visibility != visibility) { + _visibility = visibility; } } diff --git a/src/uml/qumlpackageimport.h b/src/uml/qumlpackageimport.h index f29e17aa..48c872a7 100644 --- a/src/uml/qumlpackageimport.h +++ b/src/uml/qumlpackageimport.h @@ -55,11 +55,10 @@ QT_MODULE(QtUml) class QUmlNamespace; class QUmlPackage; -class QUmlPackageImportPrivate; class Q_UML_EXPORT QUmlPackageImport : public QUmlDirectedRelationship { public: - QUmlPackageImport(bool create_d_ptr = true); + QUmlPackageImport(); // Owned attributes QUmlPackage *importedPackage() const; @@ -68,6 +67,11 @@ public: void setImportingNamespace(QUmlNamespace *importingNamespace); QtUml::VisibilityKind visibility() const; void setVisibility(QtUml::VisibilityKind visibility); + +protected: + QUmlPackage *_importedPackage; + QUmlNamespace *_importingNamespace; + QtUml::VisibilityKind _visibility; }; QT_END_NAMESPACE diff --git a/src/uml/qumlpackageimport_p.h b/src/uml/qumlpackageimport_p.h deleted file mode 100644 index 03edda80..00000000 --- a/src/uml/qumlpackageimport_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPACKAGEIMPORT_P_H -#define QUMLPACKAGEIMPORT_P_H - -#include "QtUml/QUmlPackageImport" - -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPackageImportPrivate : public QUmlDirectedRelationshipPrivate -{ -public: - QUmlPackageImportPrivate(); - - QUmlPackage *importedPackage; - QUmlNamespace *importingNamespace; - QtUml::VisibilityKind visibility; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPACKAGEIMPORT_P_H - diff --git a/src/uml/qumlpackagemerge.cpp b/src/uml/qumlpackagemerge.cpp index ea0dc71c..5981eef6 100644 --- a/src/uml/qumlpackagemerge.cpp +++ b/src/uml/qumlpackagemerge.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlpackagemerge.h" -#include "qumlpackagemerge_p.h" #include <QtUml/QUmlPackage> QT_BEGIN_NAMESPACE -QUmlPackageMergePrivate::QUmlPackageMergePrivate() : - mergedPackage(0), - receivingPackage(0) -{ -} - /*! \class QUmlPackageMerge @@ -59,11 +52,10 @@ QUmlPackageMergePrivate::QUmlPackageMergePrivate() : \brief A package merge defines how the contents of one package are extended by the contents of another package. */ -QUmlPackageMerge::QUmlPackageMerge(bool create_d_ptr) : - QUmlDirectedRelationship(false) +QUmlPackageMerge::QUmlPackageMerge() : + _mergedPackage(0), + _receivingPackage(0) { - if (create_d_ptr) - set_d_ptr(new QUmlPackageMergePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlPackage *QUmlPackageMerge::mergedPackage() const { // This is a read-write association end - QM_D(const QUmlPackageMerge); - return d->mergedPackage; + return _mergedPackage; } void QUmlPackageMerge::setMergedPackage(QUmlPackage *mergedPackage) { // This is a read-write association end - QM_D(QUmlPackageMerge); - if (d->mergedPackage != mergedPackage) { - d->mergedPackage = mergedPackage; + if (_mergedPackage != mergedPackage) { + _mergedPackage = mergedPackage; } } @@ -96,17 +86,15 @@ QUmlPackage *QUmlPackageMerge::receivingPackage() const { // This is a read-write association end - QM_D(const QUmlPackageMerge); - return d->receivingPackage; + return _receivingPackage; } void QUmlPackageMerge::setReceivingPackage(QUmlPackage *receivingPackage) { // This is a read-write association end - QM_D(QUmlPackageMerge); - if (d->receivingPackage != receivingPackage) { - d->receivingPackage = receivingPackage; + if (_receivingPackage != receivingPackage) { + _receivingPackage = receivingPackage; } } diff --git a/src/uml/qumlpackagemerge.h b/src/uml/qumlpackagemerge.h index 2985a592..f8867758 100644 --- a/src/uml/qumlpackagemerge.h +++ b/src/uml/qumlpackagemerge.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlPackage; -class QUmlPackageMergePrivate; class Q_UML_EXPORT QUmlPackageMerge : public QUmlDirectedRelationship { public: - QUmlPackageMerge(bool create_d_ptr = true); + QUmlPackageMerge(); // Owned attributes QUmlPackage *mergedPackage() const; void setMergedPackage(QUmlPackage *mergedPackage); QUmlPackage *receivingPackage() const; void setReceivingPackage(QUmlPackage *receivingPackage); + +protected: + QUmlPackage *_mergedPackage; + QUmlPackage *_receivingPackage; }; QT_END_NAMESPACE diff --git a/src/uml/qumlpackagemerge_p.h b/src/uml/qumlpackagemerge_p.h deleted file mode 100644 index 5963e648..00000000 --- a/src/uml/qumlpackagemerge_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPACKAGEMERGE_P_H -#define QUMLPACKAGEMERGE_P_H - -#include "QtUml/QUmlPackageMerge" - -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPackageMergePrivate : public QUmlDirectedRelationshipPrivate -{ -public: - QUmlPackageMergePrivate(); - - QUmlPackage *mergedPackage; - QUmlPackage *receivingPackage; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPACKAGEMERGE_P_H - diff --git a/src/uml/qumlparameter.cpp b/src/uml/qumlparameter.cpp index 7911dae8..4a7230fb 100644 --- a/src/uml/qumlparameter.cpp +++ b/src/uml/qumlparameter.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlparameter.h" -#include "qumlparameter_p.h" #include <QtUml/QUmlOperation> #include <QtUml/QUmlParameterSet> @@ -47,15 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlParameterPrivate::QUmlParameterPrivate() : - defaultValue(0), - direction(QtUml::ParameterDirectionIn), - isException(false), - isStream(false), - operation(0) -{ -} - /*! \class QUmlParameter @@ -64,12 +54,13 @@ QUmlParameterPrivate::QUmlParameterPrivate() : \brief Parameters are allowed to be treated as connectable elements.A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature.Parameters have support for streaming, exceptions, and parameter sets. */ -QUmlParameter::QUmlParameter(bool create_d_ptr) : - QUmlMultiplicityElement(false), - QUmlConnectableElement(false) +QUmlParameter::QUmlParameter() : + _defaultValue(0), + _direction(QtUml::ParameterDirectionIn), + _isException(false), + _isStream(false), + _operation(0) { - if (create_d_ptr) - set_d_ptr(new QUmlParameterPrivate); } // OWNED ATTRIBUTES @@ -105,17 +96,15 @@ QUmlValueSpecification *QUmlParameter::defaultValue() const { // This is a read-write association end - QM_D(const QUmlParameter); - return d->defaultValue; + return _defaultValue; } void QUmlParameter::setDefaultValue(QUmlValueSpecification *defaultValue) { // This is a read-write association end - QM_D(QUmlParameter); - if (d->defaultValue != defaultValue) { - d->defaultValue = defaultValue; + if (_defaultValue != defaultValue) { + _defaultValue = defaultValue; } } @@ -126,17 +115,15 @@ QtUml::ParameterDirectionKind QUmlParameter::direction() const { // This is a read-write property - QM_D(const QUmlParameter); - return d->direction; + return _direction; } void QUmlParameter::setDirection(QtUml::ParameterDirectionKind direction) { // This is a read-write property - QM_D(QUmlParameter); - if (d->direction != direction) { - d->direction = direction; + if (_direction != direction) { + _direction = direction; } } @@ -147,17 +134,15 @@ QtUml::ParameterEffectKind QUmlParameter::effect() const { // This is a read-write property - QM_D(const QUmlParameter); - return d->effect; + return _effect; } void QUmlParameter::setEffect(QtUml::ParameterEffectKind effect) { // This is a read-write property - QM_D(QUmlParameter); - if (d->effect != effect) { - d->effect = effect; + if (_effect != effect) { + _effect = effect; } } @@ -168,17 +153,15 @@ bool QUmlParameter::isException() const { // This is a read-write property - QM_D(const QUmlParameter); - return d->isException; + return _isException; } void QUmlParameter::setException(bool isException) { // This is a read-write property - QM_D(QUmlParameter); - if (d->isException != isException) { - d->isException = isException; + if (_isException != isException) { + _isException = isException; } } @@ -189,17 +172,15 @@ bool QUmlParameter::isStream() const { // This is a read-write property - QM_D(const QUmlParameter); - return d->isStream; + return _isStream; } void QUmlParameter::setStream(bool isStream) { // This is a read-write property - QM_D(QUmlParameter); - if (d->isStream != isStream) { - d->isStream = isStream; + if (_isStream != isStream) { + _isStream = isStream; } } @@ -210,17 +191,15 @@ QUmlOperation *QUmlParameter::operation() const { // This is a read-write association end - QM_D(const QUmlParameter); - return d->operation; + return _operation; } void QUmlParameter::setOperation(QUmlOperation *operation) { // This is a read-write association end - QM_D(QUmlParameter); - if (d->operation != operation) { - d->operation = operation; + if (_operation != operation) { + _operation = operation; } } @@ -231,17 +210,15 @@ QSet<QUmlParameterSet *> QUmlParameter::parameterSet() const { // This is a read-write association end - QM_D(const QUmlParameter); - return d->parameterSet; + return _parameterSet; } void QUmlParameter::addParameterSet(QUmlParameterSet *parameterSet) { // This is a read-write association end - QM_D(QUmlParameter); - if (!d->parameterSet.contains(parameterSet)) { - d->parameterSet.insert(parameterSet); + if (!_parameterSet.contains(parameterSet)) { + _parameterSet.insert(parameterSet); } } @@ -249,9 +226,8 @@ void QUmlParameter::removeParameterSet(QUmlParameterSet *parameterSet) { // This is a read-write association end - QM_D(QUmlParameter); - if (d->parameterSet.contains(parameterSet)) { - d->parameterSet.remove(parameterSet); + if (_parameterSet.contains(parameterSet)) { + _parameterSet.remove(parameterSet); } } diff --git a/src/uml/qumlparameter.h b/src/uml/qumlparameter.h index 622957f4..b611a32e 100644 --- a/src/uml/qumlparameter.h +++ b/src/uml/qumlparameter.h @@ -57,11 +57,10 @@ class QUmlOperation; class QUmlParameterSet; class QUmlValueSpecification; -class QUmlParameterPrivate; class Q_UML_EXPORT QUmlParameter : public QUmlMultiplicityElement, public QUmlConnectableElement { public: - QUmlParameter(bool create_d_ptr = true); + QUmlParameter(); // Owned attributes QString default_() const; @@ -81,6 +80,15 @@ public: QSet<QUmlParameterSet *> parameterSet() const; void addParameterSet(QUmlParameterSet *parameterSet); void removeParameterSet(QUmlParameterSet *parameterSet); + +protected: + QUmlValueSpecification *_defaultValue; + QtUml::ParameterDirectionKind _direction; + QtUml::ParameterEffectKind _effect; + bool _isException; + bool _isStream; + QUmlOperation *_operation; + QSet<QUmlParameterSet *> _parameterSet; }; QT_END_NAMESPACE diff --git a/src/uml/qumlparameter_p.h b/src/uml/qumlparameter_p.h deleted file mode 100644 index f5ced5ed..00000000 --- a/src/uml/qumlparameter_p.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPARAMETER_P_H -#define QUMLPARAMETER_P_H - -#include "QtUml/QUmlParameter" - -#include "private/qumlmultiplicityelement_p.h" -#include "private/qumlconnectableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlParameterPrivate : public QUmlMultiplicityElementPrivate, public QUmlConnectableElementPrivate -{ -public: - QUmlParameterPrivate(); - - QUmlValueSpecification *defaultValue; - QtUml::ParameterDirectionKind direction; - QtUml::ParameterEffectKind effect; - bool isException; - bool isStream; - QUmlOperation *operation; - QSet<QUmlParameterSet *> parameterSet; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPARAMETER_P_H - diff --git a/src/uml/qumlparameterableelement.cpp b/src/uml/qumlparameterableelement.cpp index 22d39e80..e2072bd3 100644 --- a/src/uml/qumlparameterableelement.cpp +++ b/src/uml/qumlparameterableelement.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlparameterableelement.h" -#include "qumlparameterableelement_p.h" #include <QtUml/QUmlTemplateParameter> QT_BEGIN_NAMESPACE -QUmlParameterableElementPrivate::QUmlParameterableElementPrivate() : - owningTemplateParameter(0), - templateParameter(0) -{ -} - /*! \class QUmlParameterableElement @@ -59,11 +52,10 @@ QUmlParameterableElementPrivate::QUmlParameterableElementPrivate() : \brief A parameterable element is an element that can be exposed as a formal template parameter for a template, or specified as an actual parameter in a binding of a template. */ -QUmlParameterableElement::QUmlParameterableElement(bool create_d_ptr) : - QUmlElement(false) +QUmlParameterableElement::QUmlParameterableElement() : + _owningTemplateParameter(0), + _templateParameter(0) { - if (create_d_ptr) - set_d_ptr(new QUmlParameterableElementPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlTemplateParameter *QUmlParameterableElement::owningTemplateParameter() const { // This is a read-write association end - QM_D(const QUmlParameterableElement); - return d->owningTemplateParameter; + return _owningTemplateParameter; } void QUmlParameterableElement::setOwningTemplateParameter(QUmlTemplateParameter *owningTemplateParameter) { // This is a read-write association end - QM_D(QUmlParameterableElement); - if (d->owningTemplateParameter != owningTemplateParameter) { - d->owningTemplateParameter = owningTemplateParameter; + if (_owningTemplateParameter != owningTemplateParameter) { + _owningTemplateParameter = owningTemplateParameter; } } @@ -96,17 +86,15 @@ QUmlTemplateParameter *QUmlParameterableElement::templateParameter() const { // This is a read-write association end - QM_D(const QUmlParameterableElement); - return d->templateParameter; + return _templateParameter; } void QUmlParameterableElement::setTemplateParameter(QUmlTemplateParameter *templateParameter) { // This is a read-write association end - QM_D(QUmlParameterableElement); - if (d->templateParameter != templateParameter) { - d->templateParameter = templateParameter; + if (_templateParameter != templateParameter) { + _templateParameter = templateParameter; } } diff --git a/src/uml/qumlparameterableelement.h b/src/uml/qumlparameterableelement.h index f45b412f..eb704502 100644 --- a/src/uml/qumlparameterableelement.h +++ b/src/uml/qumlparameterableelement.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlTemplateParameter; -class QUmlParameterableElementPrivate; class Q_UML_EXPORT QUmlParameterableElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN QUmlParameterableElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlParameterableElement(); // Owned attributes QUmlTemplateParameter *owningTemplateParameter() const; @@ -68,6 +67,10 @@ public: // Operations bool isCompatibleWith(QUmlParameterableElement *p) const; bool isTemplateParameter() const; + +protected: + QUmlTemplateParameter *_owningTemplateParameter; + QUmlTemplateParameter *_templateParameter; }; QT_END_NAMESPACE diff --git a/src/uml/qumlparameterableelement_p.h b/src/uml/qumlparameterableelement_p.h deleted file mode 100644 index 2076014f..00000000 --- a/src/uml/qumlparameterableelement_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPARAMETERABLEELEMENT_P_H -#define QUMLPARAMETERABLEELEMENT_P_H - -#include "QtUml/QUmlParameterableElement" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlParameterableElementPrivate : public virtual QUmlElementPrivate -{ -public: - QUmlParameterableElementPrivate(); - - QUmlTemplateParameter *owningTemplateParameter; - QUmlTemplateParameter *templateParameter; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPARAMETERABLEELEMENT_P_H - diff --git a/src/uml/qumlparameterset.cpp b/src/uml/qumlparameterset.cpp index 35a2b25b..db6f4b76 100644 --- a/src/uml/qumlparameterset.cpp +++ b/src/uml/qumlparameterset.cpp @@ -39,17 +39,12 @@ ** ****************************************************************************/ #include "qumlparameterset.h" -#include "qumlparameterset_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlParameter> QT_BEGIN_NAMESPACE -QUmlParameterSetPrivate::QUmlParameterSetPrivate() -{ -} - /*! \class QUmlParameterSet @@ -58,11 +53,8 @@ QUmlParameterSetPrivate::QUmlParameterSetPrivate() \brief A parameter set is an element that provides alternative sets of inputs or outputs that a behavior may use. */ -QUmlParameterSet::QUmlParameterSet(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlParameterSet::QUmlParameterSet() { - if (create_d_ptr) - set_d_ptr(new QUmlParameterSetPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QSet<QUmlConstraint *> QUmlParameterSet::condition() const { // This is a read-write association end - QM_D(const QUmlParameterSet); - return d->condition; + return _condition; } void QUmlParameterSet::addCondition(QUmlConstraint *condition) { // This is a read-write association end - QM_D(QUmlParameterSet); - if (!d->condition.contains(condition)) { - d->condition.insert(condition); + if (!_condition.contains(condition)) { + _condition.insert(condition); } } @@ -92,9 +82,8 @@ void QUmlParameterSet::removeCondition(QUmlConstraint *condition) { // This is a read-write association end - QM_D(QUmlParameterSet); - if (d->condition.contains(condition)) { - d->condition.remove(condition); + if (_condition.contains(condition)) { + _condition.remove(condition); } } @@ -105,17 +94,15 @@ QSet<QUmlParameter *> QUmlParameterSet::parameter() const { // This is a read-write association end - QM_D(const QUmlParameterSet); - return d->parameter; + return _parameter; } void QUmlParameterSet::addParameter(QUmlParameter *parameter) { // This is a read-write association end - QM_D(QUmlParameterSet); - if (!d->parameter.contains(parameter)) { - d->parameter.insert(parameter); + if (!_parameter.contains(parameter)) { + _parameter.insert(parameter); } } @@ -123,9 +110,8 @@ void QUmlParameterSet::removeParameter(QUmlParameter *parameter) { // This is a read-write association end - QM_D(QUmlParameterSet); - if (d->parameter.contains(parameter)) { - d->parameter.remove(parameter); + if (_parameter.contains(parameter)) { + _parameter.remove(parameter); } } diff --git a/src/uml/qumlparameterset.h b/src/uml/qumlparameterset.h index 5a27f06d..a36b45ca 100644 --- a/src/uml/qumlparameterset.h +++ b/src/uml/qumlparameterset.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlConstraint; class QUmlParameter; -class QUmlParameterSetPrivate; class Q_UML_EXPORT QUmlParameterSet : public QUmlNamedElement { public: - QUmlParameterSet(bool create_d_ptr = true); + QUmlParameterSet(); // Owned attributes QSet<QUmlConstraint *> condition() const; @@ -67,6 +66,10 @@ public: QSet<QUmlParameter *> parameter() const; void addParameter(QUmlParameter *parameter); void removeParameter(QUmlParameter *parameter); + +protected: + QSet<QUmlConstraint *> _condition; + QSet<QUmlParameter *> _parameter; }; QT_END_NAMESPACE diff --git a/src/uml/qumlparameterset_p.h b/src/uml/qumlparameterset_p.h deleted file mode 100644 index 9e59d1ed..00000000 --- a/src/uml/qumlparameterset_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPARAMETERSET_P_H -#define QUMLPARAMETERSET_P_H - -#include "QtUml/QUmlParameterSet" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlParameterSetPrivate : public QUmlNamedElementPrivate -{ -public: - QUmlParameterSetPrivate(); - - QSet<QUmlConstraint *> condition; - QSet<QUmlParameter *> parameter; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPARAMETERSET_P_H - diff --git a/src/uml/qumlpartdecomposition.cpp b/src/uml/qumlpartdecomposition.cpp index c25a0709..2eb6cf07 100644 --- a/src/uml/qumlpartdecomposition.cpp +++ b/src/uml/qumlpartdecomposition.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlpartdecomposition.h" -#include "qumlpartdecomposition_p.h" QT_BEGIN_NAMESPACE -QUmlPartDecompositionPrivate::QUmlPartDecompositionPrivate() -{ -} - /*! \class QUmlPartDecomposition @@ -55,11 +50,8 @@ QUmlPartDecompositionPrivate::QUmlPartDecompositionPrivate() \brief A part decomposition is a description of the internal interactions of one lifeline relative to an interaction. */ -QUmlPartDecomposition::QUmlPartDecomposition(bool create_d_ptr) : - QUmlInteractionUse(false) +QUmlPartDecomposition::QUmlPartDecomposition() { - if (create_d_ptr) - set_d_ptr(new QUmlPartDecompositionPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlpartdecomposition.h b/src/uml/qumlpartdecomposition.h index 07bf0c24..c02ce5cb 100644 --- a/src/uml/qumlpartdecomposition.h +++ b/src/uml/qumlpartdecomposition.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlPartDecompositionPrivate; class Q_UML_EXPORT QUmlPartDecomposition : public QUmlInteractionUse { public: - QUmlPartDecomposition(bool create_d_ptr = true); + QUmlPartDecomposition(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlpartdecomposition_p.h b/src/uml/qumlpartdecomposition_p.h deleted file mode 100644 index 2aa949b1..00000000 --- a/src/uml/qumlpartdecomposition_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPARTDECOMPOSITION_P_H -#define QUMLPARTDECOMPOSITION_P_H - -#include "QtUml/QUmlPartDecomposition" - -#include "private/qumlinteractionuse_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPartDecompositionPrivate : public QUmlInteractionUsePrivate -{ -public: - QUmlPartDecompositionPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPARTDECOMPOSITION_P_H - diff --git a/src/uml/qumlpin.cpp b/src/uml/qumlpin.cpp index fb892e92..8a0cd6ed 100644 --- a/src/uml/qumlpin.cpp +++ b/src/uml/qumlpin.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlpin.h" -#include "qumlpin_p.h" QT_BEGIN_NAMESPACE -QUmlPinPrivate::QUmlPinPrivate() : - isControl(false) -{ -} - /*! \class QUmlPin @@ -56,12 +50,9 @@ QUmlPinPrivate::QUmlPinPrivate() : \brief A pin is a typed element and multiplicity element that provides values to actions and accept result values from them.A pin is an object node for inputs and outputs to actions. */ -QUmlPin::QUmlPin(bool create_d_ptr) : - QUmlMultiplicityElement(false), - QUmlObjectNode(false) +QUmlPin::QUmlPin() : + _isControl(false) { - if (create_d_ptr) - set_d_ptr(new QUmlPinPrivate); } // OWNED ATTRIBUTES @@ -73,17 +64,15 @@ bool QUmlPin::isControl() const { // This is a read-write property - QM_D(const QUmlPin); - return d->isControl; + return _isControl; } void QUmlPin::setControl(bool isControl) { // This is a read-write property - QM_D(QUmlPin); - if (d->isControl != isControl) { - d->isControl = isControl; + if (_isControl != isControl) { + _isControl = isControl; } } diff --git a/src/uml/qumlpin.h b/src/uml/qumlpin.h index 0ffc5089..2e9b27d4 100644 --- a/src/uml/qumlpin.h +++ b/src/uml/qumlpin.h @@ -52,15 +52,17 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlPinPrivate; class Q_UML_EXPORT QUmlPin : public QUmlMultiplicityElement, public QUmlObjectNode { public: - Q_DECL_HIDDEN QUmlPin(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlPin(); // Owned attributes bool isControl() const; void setControl(bool isControl); + +protected: + bool _isControl; }; QT_END_NAMESPACE diff --git a/src/uml/qumlpin_p.h b/src/uml/qumlpin_p.h deleted file mode 100644 index 965d8f3d..00000000 --- a/src/uml/qumlpin_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPIN_P_H -#define QUMLPIN_P_H - -#include "QtUml/QUmlPin" - -#include "private/qumlmultiplicityelement_p.h" -#include "private/qumlobjectnode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPinPrivate : public QUmlMultiplicityElementPrivate, public QUmlObjectNodePrivate -{ -public: - QUmlPinPrivate(); - - bool isControl; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPIN_P_H - diff --git a/src/uml/qumlport.cpp b/src/uml/qumlport.cpp index 53eebbeb..9dafc013 100644 --- a/src/uml/qumlport.cpp +++ b/src/uml/qumlport.cpp @@ -39,21 +39,12 @@ ** ****************************************************************************/ #include "qumlport.h" -#include "qumlport_p.h" #include <QtUml/QUmlInterface> #include <QtUml/QUmlProtocolStateMachine> QT_BEGIN_NAMESPACE -QUmlPortPrivate::QUmlPortPrivate() : - isBehavior(false), - isConjugated(false), - isService(true), - protocol(0) -{ -} - /*! \class QUmlPort @@ -62,11 +53,12 @@ QUmlPortPrivate::QUmlPortPrivate() : \brief A port has an associated protocol state machine.A port is a property of a classifier that specifies a distinct interaction point between that classifier and its environment or between the (behavior of the) classifier and its internal parts. Ports are connected to properties of the classifier by connectors through which requests can be made to invoke the behavioral features of a classifier. A Port may specify the services a classifier provides (offers) to its environment as well as the services that a classifier expects (requires) of its environment. */ -QUmlPort::QUmlPort(bool create_d_ptr) : - QUmlProperty(false) +QUmlPort::QUmlPort() : + _isBehavior(false), + _isConjugated(false), + _isService(true), + _protocol(0) { - if (create_d_ptr) - set_d_ptr(new QUmlPortPrivate); } // OWNED ATTRIBUTES @@ -78,17 +70,15 @@ bool QUmlPort::isBehavior() const { // This is a read-write property - QM_D(const QUmlPort); - return d->isBehavior; + return _isBehavior; } void QUmlPort::setBehavior(bool isBehavior) { // This is a read-write property - QM_D(QUmlPort); - if (d->isBehavior != isBehavior) { - d->isBehavior = isBehavior; + if (_isBehavior != isBehavior) { + _isBehavior = isBehavior; } } @@ -99,17 +89,15 @@ bool QUmlPort::isConjugated() const { // This is a read-write property - QM_D(const QUmlPort); - return d->isConjugated; + return _isConjugated; } void QUmlPort::setConjugated(bool isConjugated) { // This is a read-write property - QM_D(QUmlPort); - if (d->isConjugated != isConjugated) { - d->isConjugated = isConjugated; + if (_isConjugated != isConjugated) { + _isConjugated = isConjugated; } } @@ -120,17 +108,15 @@ bool QUmlPort::isService() const { // This is a read-write property - QM_D(const QUmlPort); - return d->isService; + return _isService; } void QUmlPort::setService(bool isService) { // This is a read-write property - QM_D(QUmlPort); - if (d->isService != isService) { - d->isService = isService; + if (_isService != isService) { + _isService = isService; } } @@ -141,17 +127,15 @@ QUmlProtocolStateMachine *QUmlPort::protocol() const { // This is a read-write association end - QM_D(const QUmlPort); - return d->protocol; + return _protocol; } void QUmlPort::setProtocol(QUmlProtocolStateMachine *protocol) { // This is a read-write association end - QM_D(QUmlPort); - if (d->protocol != protocol) { - d->protocol = protocol; + if (_protocol != protocol) { + _protocol = protocol; } } @@ -174,17 +158,15 @@ QSet<QUmlPort *> QUmlPort::redefinedPort() const { // This is a read-write association end - QM_D(const QUmlPort); - return d->redefinedPort; + return _redefinedPort; } void QUmlPort::addRedefinedPort(QUmlPort *redefinedPort) { // This is a read-write association end - QM_D(QUmlPort); - if (!d->redefinedPort.contains(redefinedPort)) { - d->redefinedPort.insert(redefinedPort); + if (!_redefinedPort.contains(redefinedPort)) { + _redefinedPort.insert(redefinedPort); } } @@ -192,9 +174,8 @@ void QUmlPort::removeRedefinedPort(QUmlPort *redefinedPort) { // This is a read-write association end - QM_D(QUmlPort); - if (d->redefinedPort.contains(redefinedPort)) { - d->redefinedPort.remove(redefinedPort); + if (_redefinedPort.contains(redefinedPort)) { + _redefinedPort.remove(redefinedPort); } } diff --git a/src/uml/qumlport.h b/src/uml/qumlport.h index d53607b9..e858ba65 100644 --- a/src/uml/qumlport.h +++ b/src/uml/qumlport.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlInterface; class QUmlProtocolStateMachine; -class QUmlPortPrivate; class Q_UML_EXPORT QUmlPort : public QUmlProperty { public: - QUmlPort(bool create_d_ptr = true); + QUmlPort(); // Owned attributes bool isBehavior() const; @@ -74,6 +73,13 @@ public: void addRedefinedPort(QUmlPort *redefinedPort); void removeRedefinedPort(QUmlPort *redefinedPort); QSet<QUmlInterface *> required() const; + +protected: + bool _isBehavior; + bool _isConjugated; + bool _isService; + QUmlProtocolStateMachine *_protocol; + QSet<QUmlPort *> _redefinedPort; }; QT_END_NAMESPACE diff --git a/src/uml/qumlport_p.h b/src/uml/qumlport_p.h deleted file mode 100644 index 9253f088..00000000 --- a/src/uml/qumlport_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPORT_P_H -#define QUMLPORT_P_H - -#include "QtUml/QUmlPort" - -#include "private/qumlproperty_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPortPrivate : public QUmlPropertyPrivate -{ -public: - QUmlPortPrivate(); - - bool isBehavior; - bool isConjugated; - bool isService; - QUmlProtocolStateMachine *protocol; - QSet<QUmlPort *> redefinedPort; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPORT_P_H - diff --git a/src/uml/qumlprimitivetype.cpp b/src/uml/qumlprimitivetype.cpp index 757c40c3..e8f39904 100644 --- a/src/uml/qumlprimitivetype.cpp +++ b/src/uml/qumlprimitivetype.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlprimitivetype.h" -#include "qumlprimitivetype_p.h" QT_BEGIN_NAMESPACE -QUmlPrimitiveTypePrivate::QUmlPrimitiveTypePrivate() -{ -} - /*! \class QUmlPrimitiveType @@ -55,11 +50,8 @@ QUmlPrimitiveTypePrivate::QUmlPrimitiveTypePrivate() \brief A primitive type defines a predefined data type, without any relevant substructure (i.e., it has no parts in the context of UML). A primitive datatype may have an algebra and operations defined outside of UML, for example, mathematically. */ -QUmlPrimitiveType::QUmlPrimitiveType(bool create_d_ptr) : - QUmlDataType(false) +QUmlPrimitiveType::QUmlPrimitiveType() { - if (create_d_ptr) - set_d_ptr(new QUmlPrimitiveTypePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlprimitivetype.h b/src/uml/qumlprimitivetype.h index 0d4b969a..cd5c8563 100644 --- a/src/uml/qumlprimitivetype.h +++ b/src/uml/qumlprimitivetype.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlPrimitiveTypePrivate; class Q_UML_EXPORT QUmlPrimitiveType : public QUmlDataType { public: - QUmlPrimitiveType(bool create_d_ptr = true); + QUmlPrimitiveType(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlprimitivetype_p.h b/src/uml/qumlprimitivetype_p.h deleted file mode 100644 index 3c6fa39b..00000000 --- a/src/uml/qumlprimitivetype_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPRIMITIVETYPE_P_H -#define QUMLPRIMITIVETYPE_P_H - -#include "QtUml/QUmlPrimitiveType" - -#include "private/qumldatatype_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPrimitiveTypePrivate : public QUmlDataTypePrivate -{ -public: - QUmlPrimitiveTypePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPRIMITIVETYPE_P_H - diff --git a/src/uml/qumlprofile.cpp b/src/uml/qumlprofile.cpp index 40289f01..633919bc 100644 --- a/src/uml/qumlprofile.cpp +++ b/src/uml/qumlprofile.cpp @@ -39,17 +39,12 @@ ** ****************************************************************************/ #include "qumlprofile.h" -#include "qumlprofile_p.h" #include <QtUml/QUmlElementImport> #include <QtUml/QUmlPackageImport> QT_BEGIN_NAMESPACE -QUmlProfilePrivate::QUmlProfilePrivate() -{ -} - /*! \class QUmlProfile @@ -58,11 +53,8 @@ QUmlProfilePrivate::QUmlProfilePrivate() \brief A profile defines limited extensions to a reference metamodel with the purpose of adapting the metamodel to a specific platform or domain. */ -QUmlProfile::QUmlProfile(bool create_d_ptr) : - QUmlPackage(false) +QUmlProfile::QUmlProfile() { - if (create_d_ptr) - set_d_ptr(new QUmlProfilePrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QSet<QUmlElementImport *> QUmlProfile::metaclassReference() const { // This is a read-write association end - QM_D(const QUmlProfile); - return d->metaclassReference; + return _metaclassReference; } void QUmlProfile::addMetaclassReference(QUmlElementImport *metaclassReference) { // This is a read-write association end - QM_D(QUmlProfile); - if (!d->metaclassReference.contains(metaclassReference)) { - d->metaclassReference.insert(metaclassReference); + if (!_metaclassReference.contains(metaclassReference)) { + _metaclassReference.insert(metaclassReference); } } @@ -92,9 +82,8 @@ void QUmlProfile::removeMetaclassReference(QUmlElementImport *metaclassReference { // This is a read-write association end - QM_D(QUmlProfile); - if (d->metaclassReference.contains(metaclassReference)) { - d->metaclassReference.remove(metaclassReference); + if (_metaclassReference.contains(metaclassReference)) { + _metaclassReference.remove(metaclassReference); } } @@ -105,17 +94,15 @@ QSet<QUmlPackageImport *> QUmlProfile::metamodelReference() const { // This is a read-write association end - QM_D(const QUmlProfile); - return d->metamodelReference; + return _metamodelReference; } void QUmlProfile::addMetamodelReference(QUmlPackageImport *metamodelReference) { // This is a read-write association end - QM_D(QUmlProfile); - if (!d->metamodelReference.contains(metamodelReference)) { - d->metamodelReference.insert(metamodelReference); + if (!_metamodelReference.contains(metamodelReference)) { + _metamodelReference.insert(metamodelReference); } } @@ -123,9 +110,8 @@ void QUmlProfile::removeMetamodelReference(QUmlPackageImport *metamodelReference { // This is a read-write association end - QM_D(QUmlProfile); - if (d->metamodelReference.contains(metamodelReference)) { - d->metamodelReference.remove(metamodelReference); + if (_metamodelReference.contains(metamodelReference)) { + _metamodelReference.remove(metamodelReference); } } diff --git a/src/uml/qumlprofile.h b/src/uml/qumlprofile.h index 7d12839f..b94d9a2b 100644 --- a/src/uml/qumlprofile.h +++ b/src/uml/qumlprofile.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlElementImport; class QUmlPackageImport; -class QUmlProfilePrivate; class Q_UML_EXPORT QUmlProfile : public QUmlPackage { public: - QUmlProfile(bool create_d_ptr = true); + QUmlProfile(); // Owned attributes QSet<QUmlElementImport *> metaclassReference() const; @@ -67,6 +66,10 @@ public: QSet<QUmlPackageImport *> metamodelReference() const; void addMetamodelReference(QUmlPackageImport *metamodelReference); void removeMetamodelReference(QUmlPackageImport *metamodelReference); + +protected: + QSet<QUmlElementImport *> _metaclassReference; + QSet<QUmlPackageImport *> _metamodelReference; }; QT_END_NAMESPACE diff --git a/src/uml/qumlprofile_p.h b/src/uml/qumlprofile_p.h deleted file mode 100644 index f9951083..00000000 --- a/src/uml/qumlprofile_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPROFILE_P_H -#define QUMLPROFILE_P_H - -#include "QtUml/QUmlProfile" - -#include "private/qumlpackage_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlProfilePrivate : public QUmlPackagePrivate -{ -public: - QUmlProfilePrivate(); - - QSet<QUmlElementImport *> metaclassReference; - QSet<QUmlPackageImport *> metamodelReference; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPROFILE_P_H - diff --git a/src/uml/qumlprofileapplication.cpp b/src/uml/qumlprofileapplication.cpp index 4732bb8f..40e9949f 100644 --- a/src/uml/qumlprofileapplication.cpp +++ b/src/uml/qumlprofileapplication.cpp @@ -39,20 +39,12 @@ ** ****************************************************************************/ #include "qumlprofileapplication.h" -#include "qumlprofileapplication_p.h" #include <QtUml/QUmlPackage> #include <QtUml/QUmlProfile> QT_BEGIN_NAMESPACE -QUmlProfileApplicationPrivate::QUmlProfileApplicationPrivate() : - appliedProfile(0), - applyingPackage(0), - isStrict(false) -{ -} - /*! \class QUmlProfileApplication @@ -61,11 +53,11 @@ QUmlProfileApplicationPrivate::QUmlProfileApplicationPrivate() : \brief A profile application is used to show which profiles have been applied to a package. */ -QUmlProfileApplication::QUmlProfileApplication(bool create_d_ptr) : - QUmlDirectedRelationship(false) +QUmlProfileApplication::QUmlProfileApplication() : + _appliedProfile(0), + _applyingPackage(0), + _isStrict(false) { - if (create_d_ptr) - set_d_ptr(new QUmlProfileApplicationPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlProfile *QUmlProfileApplication::appliedProfile() const { // This is a read-write association end - QM_D(const QUmlProfileApplication); - return d->appliedProfile; + return _appliedProfile; } void QUmlProfileApplication::setAppliedProfile(QUmlProfile *appliedProfile) { // This is a read-write association end - QM_D(QUmlProfileApplication); - if (d->appliedProfile != appliedProfile) { - d->appliedProfile = appliedProfile; + if (_appliedProfile != appliedProfile) { + _appliedProfile = appliedProfile; } } @@ -98,17 +88,15 @@ QUmlPackage *QUmlProfileApplication::applyingPackage() const { // This is a read-write association end - QM_D(const QUmlProfileApplication); - return d->applyingPackage; + return _applyingPackage; } void QUmlProfileApplication::setApplyingPackage(QUmlPackage *applyingPackage) { // This is a read-write association end - QM_D(QUmlProfileApplication); - if (d->applyingPackage != applyingPackage) { - d->applyingPackage = applyingPackage; + if (_applyingPackage != applyingPackage) { + _applyingPackage = applyingPackage; } } @@ -119,17 +107,15 @@ bool QUmlProfileApplication::isStrict() const { // This is a read-write property - QM_D(const QUmlProfileApplication); - return d->isStrict; + return _isStrict; } void QUmlProfileApplication::setStrict(bool isStrict) { // This is a read-write property - QM_D(QUmlProfileApplication); - if (d->isStrict != isStrict) { - d->isStrict = isStrict; + if (_isStrict != isStrict) { + _isStrict = isStrict; } } diff --git a/src/uml/qumlprofileapplication.h b/src/uml/qumlprofileapplication.h index e8ca6fd3..415b65d0 100644 --- a/src/uml/qumlprofileapplication.h +++ b/src/uml/qumlprofileapplication.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlPackage; class QUmlProfile; -class QUmlProfileApplicationPrivate; class Q_UML_EXPORT QUmlProfileApplication : public QUmlDirectedRelationship { public: - QUmlProfileApplication(bool create_d_ptr = true); + QUmlProfileApplication(); // Owned attributes QUmlProfile *appliedProfile() const; @@ -67,6 +66,11 @@ public: void setApplyingPackage(QUmlPackage *applyingPackage); bool isStrict() const; void setStrict(bool isStrict); + +protected: + QUmlProfile *_appliedProfile; + QUmlPackage *_applyingPackage; + bool _isStrict; }; QT_END_NAMESPACE diff --git a/src/uml/qumlprofileapplication_p.h b/src/uml/qumlprofileapplication_p.h deleted file mode 100644 index 4c927fe9..00000000 --- a/src/uml/qumlprofileapplication_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPROFILEAPPLICATION_P_H -#define QUMLPROFILEAPPLICATION_P_H - -#include "QtUml/QUmlProfileApplication" - -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlProfileApplicationPrivate : public QUmlDirectedRelationshipPrivate -{ -public: - QUmlProfileApplicationPrivate(); - - QUmlProfile *appliedProfile; - QUmlPackage *applyingPackage; - bool isStrict; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPROFILEAPPLICATION_P_H - diff --git a/src/uml/qumlproperty.cpp b/src/uml/qumlproperty.cpp index abaaf94f..5b20b6ec 100644 --- a/src/uml/qumlproperty.cpp +++ b/src/uml/qumlproperty.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlproperty.h" -#include "qumlproperty_p.h" #include <QtUml/QUmlAssociation> #include <QtUml/QUmlClass> @@ -52,22 +51,6 @@ QT_BEGIN_NAMESPACE -QUmlPropertyPrivate::QUmlPropertyPrivate() : - aggregation(QtUml::AggregationNone), - association(0), - associationEnd(0), - class_(0), - datatype(0), - defaultValue(0), - interface_(0), - isDerived(false), - isDerivedUnion(false), - isID(false), - isReadOnly(false), - owningAssociation(0) -{ -} - /*! \class QUmlProperty @@ -76,13 +59,20 @@ QUmlPropertyPrivate::QUmlPropertyPrivate() : \brief Property represents a declared state of one or more instances in terms of a named relationship to a value or values. When a property is an attribute of a classifier, the value or values are related to the instance of the classifier by being held in slots of the instance. When a property is an association end, the value or values are related to the instance or instances at the other end(s) of the association. The range of valid values represented by the property can be controlled by setting the property's type.A property is a structural feature of a classifier that characterizes instances of the classifier. A property related by ownedAttribute to a classifier (other than an association) represents an attribute and might also represent an association end. It relates an instance of the class to a value or set of values of the type of the attribute. A property related by memberEnd or its specializations to an association represents an end of the association. The type of the property is the type of the end of the association.A property has the capability of being a deployment target in a deployment relationship. This enables modeling the deployment to hierarchical nodes that have properties functioning as internal parts.Property specializes ParameterableElement to specify that a property can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template.A property represents a set of instances that are owned by a containing classifier instance. */ -QUmlProperty::QUmlProperty(bool create_d_ptr) : - QUmlStructuralFeature(false), - QUmlConnectableElement(false), - QUmlDeploymentTarget(false) +QUmlProperty::QUmlProperty() : + _aggregation(QtUml::AggregationNone), + _association(0), + _associationEnd(0), + _class_(0), + _datatype(0), + _defaultValue(0), + _interface_(0), + _isDerived(false), + _isDerivedUnion(false), + _isID(false), + _isReadOnly(false), + _owningAssociation(0) { - if (create_d_ptr) - set_d_ptr(new QUmlPropertyPrivate); } // OWNED ATTRIBUTES @@ -94,17 +84,15 @@ QtUml::AggregationKind QUmlProperty::aggregation() const { // This is a read-write property - QM_D(const QUmlProperty); - return d->aggregation; + return _aggregation; } void QUmlProperty::setAggregation(QtUml::AggregationKind aggregation) { // This is a read-write property - QM_D(QUmlProperty); - if (d->aggregation != aggregation) { - d->aggregation = aggregation; + if (_aggregation != aggregation) { + _aggregation = aggregation; } } @@ -115,17 +103,15 @@ QUmlAssociation *QUmlProperty::association() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->association; + return _association; } void QUmlProperty::setAssociation(QUmlAssociation *association) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->association != association) { - d->association = association; + if (_association != association) { + _association = association; } } @@ -136,17 +122,15 @@ QUmlProperty *QUmlProperty::associationEnd() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->associationEnd; + return _associationEnd; } void QUmlProperty::setAssociationEnd(QUmlProperty *associationEnd) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->associationEnd != associationEnd) { - d->associationEnd = associationEnd; + if (_associationEnd != associationEnd) { + _associationEnd = associationEnd; } } @@ -157,17 +141,15 @@ QUmlClass *QUmlProperty::class_() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->class_; + return _class_; } void QUmlProperty::setClass(QUmlClass *class_) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->class_ != class_) { - d->class_ = class_; + if (_class_ != class_) { + _class_ = class_; } } @@ -178,17 +160,15 @@ QUmlDataType *QUmlProperty::datatype() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->datatype; + return _datatype; } void QUmlProperty::setDatatype(QUmlDataType *datatype) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->datatype != datatype) { - d->datatype = datatype; + if (_datatype != datatype) { + _datatype = datatype; } } @@ -223,17 +203,15 @@ QUmlValueSpecification *QUmlProperty::defaultValue() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->defaultValue; + return _defaultValue; } void QUmlProperty::setDefaultValue(QUmlValueSpecification *defaultValue) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->defaultValue != defaultValue) { - d->defaultValue = defaultValue; + if (_defaultValue != defaultValue) { + _defaultValue = defaultValue; } } @@ -244,17 +222,15 @@ QUmlInterface *QUmlProperty::interface_() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->interface_; + return _interface_; } void QUmlProperty::setInterface(QUmlInterface *interface_) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->interface_ != interface_) { - d->interface_ = interface_; + if (_interface_ != interface_) { + _interface_ = interface_; } } @@ -289,17 +265,15 @@ bool QUmlProperty::isDerived() const { // This is a read-write property - QM_D(const QUmlProperty); - return d->isDerived; + return _isDerived; } void QUmlProperty::setDerived(bool isDerived) { // This is a read-write property - QM_D(QUmlProperty); - if (d->isDerived != isDerived) { - d->isDerived = isDerived; + if (_isDerived != isDerived) { + _isDerived = isDerived; } } @@ -310,17 +284,15 @@ bool QUmlProperty::isDerivedUnion() const { // This is a read-write property - QM_D(const QUmlProperty); - return d->isDerivedUnion; + return _isDerivedUnion; } void QUmlProperty::setDerivedUnion(bool isDerivedUnion) { // This is a read-write property - QM_D(QUmlProperty); - if (d->isDerivedUnion != isDerivedUnion) { - d->isDerivedUnion = isDerivedUnion; + if (_isDerivedUnion != isDerivedUnion) { + _isDerivedUnion = isDerivedUnion; } } @@ -331,17 +303,15 @@ bool QUmlProperty::isID() const { // This is a read-write property - QM_D(const QUmlProperty); - return d->isID; + return _isID; } void QUmlProperty::setID(bool isID) { // This is a read-write property - QM_D(QUmlProperty); - if (d->isID != isID) { - d->isID = isID; + if (_isID != isID) { + _isID = isID; } } @@ -352,17 +322,15 @@ bool QUmlProperty::isReadOnly() const { // This is a read-write property - QM_D(const QUmlProperty); - return d->isReadOnly; + return _isReadOnly; } void QUmlProperty::setReadOnly(bool isReadOnly) { // This is a read-write property - QM_D(QUmlProperty); - if (d->isReadOnly != isReadOnly) { - d->isReadOnly = isReadOnly; + if (_isReadOnly != isReadOnly) { + _isReadOnly = isReadOnly; } } @@ -397,17 +365,15 @@ QUmlAssociation *QUmlProperty::owningAssociation() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->owningAssociation; + return _owningAssociation; } void QUmlProperty::setOwningAssociation(QUmlAssociation *owningAssociation) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->owningAssociation != owningAssociation) { - d->owningAssociation = owningAssociation; + if (_owningAssociation != owningAssociation) { + _owningAssociation = owningAssociation; } } @@ -418,17 +384,15 @@ QList<QUmlProperty *> QUmlProperty::qualifier() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->qualifier; + return _qualifier; } void QUmlProperty::addQualifier(QUmlProperty *qualifier) { // This is a read-write association end - QM_D(QUmlProperty); - if (!d->qualifier.contains(qualifier)) { - d->qualifier.append(qualifier); + if (!_qualifier.contains(qualifier)) { + _qualifier.append(qualifier); } } @@ -436,9 +400,8 @@ void QUmlProperty::removeQualifier(QUmlProperty *qualifier) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->qualifier.contains(qualifier)) { - d->qualifier.removeAll(qualifier); + if (_qualifier.contains(qualifier)) { + _qualifier.removeAll(qualifier); } } @@ -449,17 +412,15 @@ QSet<QUmlProperty *> QUmlProperty::redefinedProperty() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->redefinedProperty; + return _redefinedProperty; } void QUmlProperty::addRedefinedProperty(QUmlProperty *redefinedProperty) { // This is a read-write association end - QM_D(QUmlProperty); - if (!d->redefinedProperty.contains(redefinedProperty)) { - d->redefinedProperty.insert(redefinedProperty); + if (!_redefinedProperty.contains(redefinedProperty)) { + _redefinedProperty.insert(redefinedProperty); } } @@ -467,9 +428,8 @@ void QUmlProperty::removeRedefinedProperty(QUmlProperty *redefinedProperty) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->redefinedProperty.contains(redefinedProperty)) { - d->redefinedProperty.remove(redefinedProperty); + if (_redefinedProperty.contains(redefinedProperty)) { + _redefinedProperty.remove(redefinedProperty); } } @@ -480,17 +440,15 @@ QSet<QUmlProperty *> QUmlProperty::subsettedProperty() const { // This is a read-write association end - QM_D(const QUmlProperty); - return d->subsettedProperty; + return _subsettedProperty; } void QUmlProperty::addSubsettedProperty(QUmlProperty *subsettedProperty) { // This is a read-write association end - QM_D(QUmlProperty); - if (!d->subsettedProperty.contains(subsettedProperty)) { - d->subsettedProperty.insert(subsettedProperty); + if (!_subsettedProperty.contains(subsettedProperty)) { + _subsettedProperty.insert(subsettedProperty); } } @@ -498,9 +456,8 @@ void QUmlProperty::removeSubsettedProperty(QUmlProperty *subsettedProperty) { // This is a read-write association end - QM_D(QUmlProperty); - if (d->subsettedProperty.contains(subsettedProperty)) { - d->subsettedProperty.remove(subsettedProperty); + if (_subsettedProperty.contains(subsettedProperty)) { + _subsettedProperty.remove(subsettedProperty); } } diff --git a/src/uml/qumlproperty.h b/src/uml/qumlproperty.h index d6cde190..e0295d54 100644 --- a/src/uml/qumlproperty.h +++ b/src/uml/qumlproperty.h @@ -63,11 +63,10 @@ class QUmlRedefinableElement; class QUmlType; class QUmlValueSpecification; -class QUmlPropertyPrivate; class Q_UML_EXPORT QUmlProperty : public QUmlStructuralFeature, public QUmlConnectableElement, public QUmlDeploymentTarget { public: - QUmlProperty(bool create_d_ptr = true); + QUmlProperty(); // Owned attributes QtUml::AggregationKind aggregation() const; @@ -116,6 +115,23 @@ public: bool isConsistentWith(QUmlRedefinableElement *redefinee) const; bool isNavigable() const; QSet<QUmlType *> subsettingContext() const; + +protected: + QtUml::AggregationKind _aggregation; + QUmlAssociation *_association; + QUmlProperty *_associationEnd; + QUmlClass *_class_; + QUmlDataType *_datatype; + QUmlValueSpecification *_defaultValue; + QUmlInterface *_interface_; + bool _isDerived; + bool _isDerivedUnion; + bool _isID; + bool _isReadOnly; + QUmlAssociation *_owningAssociation; + QList<QUmlProperty *> _qualifier; + QSet<QUmlProperty *> _redefinedProperty; + QSet<QUmlProperty *> _subsettedProperty; }; QT_END_NAMESPACE diff --git a/src/uml/qumlproperty_p.h b/src/uml/qumlproperty_p.h deleted file mode 100644 index 55a1e2b6..00000000 --- a/src/uml/qumlproperty_p.h +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPROPERTY_P_H -#define QUMLPROPERTY_P_H - -#include "QtUml/QUmlProperty" - -#include "private/qumlstructuralfeature_p.h" -#include "private/qumlconnectableelement_p.h" -#include "private/qumldeploymenttarget_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPropertyPrivate : public QUmlStructuralFeaturePrivate, public QUmlConnectableElementPrivate, public QUmlDeploymentTargetPrivate -{ -public: - QUmlPropertyPrivate(); - - QtUml::AggregationKind aggregation; - QUmlAssociation *association; - QUmlProperty *associationEnd; - QUmlClass *class_; - QUmlDataType *datatype; - QUmlValueSpecification *defaultValue; - QUmlInterface *interface_; - bool isDerived; - bool isDerivedUnion; - bool isID; - bool isReadOnly; - QUmlAssociation *owningAssociation; - QList<QUmlProperty *> qualifier; - QSet<QUmlProperty *> redefinedProperty; - QSet<QUmlProperty *> subsettedProperty; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPROPERTY_P_H - diff --git a/src/uml/qumlprotocolconformance.cpp b/src/uml/qumlprotocolconformance.cpp index 6b58599c..3fcffcc4 100644 --- a/src/uml/qumlprotocolconformance.cpp +++ b/src/uml/qumlprotocolconformance.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlprotocolconformance.h" -#include "qumlprotocolconformance_p.h" #include <QtUml/QUmlProtocolStateMachine> QT_BEGIN_NAMESPACE -QUmlProtocolConformancePrivate::QUmlProtocolConformancePrivate() : - generalMachine(0), - specificMachine(0) -{ -} - /*! \class QUmlProtocolConformance @@ -59,11 +52,10 @@ QUmlProtocolConformancePrivate::QUmlProtocolConformancePrivate() : \brief Protocol state machines can be redefined into more specific protocol state machines, or into behavioral state machines. Protocol conformance declares that the specific protocol state machine specifies a protocol that conforms to the general state machine one, or that the specific behavioral state machine abide by the protocol of the general protocol state machine. */ -QUmlProtocolConformance::QUmlProtocolConformance(bool create_d_ptr) : - QUmlDirectedRelationship(false) +QUmlProtocolConformance::QUmlProtocolConformance() : + _generalMachine(0), + _specificMachine(0) { - if (create_d_ptr) - set_d_ptr(new QUmlProtocolConformancePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlProtocolStateMachine *QUmlProtocolConformance::generalMachine() const { // This is a read-write association end - QM_D(const QUmlProtocolConformance); - return d->generalMachine; + return _generalMachine; } void QUmlProtocolConformance::setGeneralMachine(QUmlProtocolStateMachine *generalMachine) { // This is a read-write association end - QM_D(QUmlProtocolConformance); - if (d->generalMachine != generalMachine) { - d->generalMachine = generalMachine; + if (_generalMachine != generalMachine) { + _generalMachine = generalMachine; } } @@ -96,17 +86,15 @@ QUmlProtocolStateMachine *QUmlProtocolConformance::specificMachine() const { // This is a read-write association end - QM_D(const QUmlProtocolConformance); - return d->specificMachine; + return _specificMachine; } void QUmlProtocolConformance::setSpecificMachine(QUmlProtocolStateMachine *specificMachine) { // This is a read-write association end - QM_D(QUmlProtocolConformance); - if (d->specificMachine != specificMachine) { - d->specificMachine = specificMachine; + if (_specificMachine != specificMachine) { + _specificMachine = specificMachine; } } diff --git a/src/uml/qumlprotocolconformance.h b/src/uml/qumlprotocolconformance.h index 4177e275..7bea6c17 100644 --- a/src/uml/qumlprotocolconformance.h +++ b/src/uml/qumlprotocolconformance.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlProtocolStateMachine; -class QUmlProtocolConformancePrivate; class Q_UML_EXPORT QUmlProtocolConformance : public QUmlDirectedRelationship { public: - QUmlProtocolConformance(bool create_d_ptr = true); + QUmlProtocolConformance(); // Owned attributes QUmlProtocolStateMachine *generalMachine() const; void setGeneralMachine(QUmlProtocolStateMachine *generalMachine); QUmlProtocolStateMachine *specificMachine() const; void setSpecificMachine(QUmlProtocolStateMachine *specificMachine); + +protected: + QUmlProtocolStateMachine *_generalMachine; + QUmlProtocolStateMachine *_specificMachine; }; QT_END_NAMESPACE diff --git a/src/uml/qumlprotocolconformance_p.h b/src/uml/qumlprotocolconformance_p.h deleted file mode 100644 index 7943a212..00000000 --- a/src/uml/qumlprotocolconformance_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPROTOCOLCONFORMANCE_P_H -#define QUMLPROTOCOLCONFORMANCE_P_H - -#include "QtUml/QUmlProtocolConformance" - -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlProtocolConformancePrivate : public QUmlDirectedRelationshipPrivate -{ -public: - QUmlProtocolConformancePrivate(); - - QUmlProtocolStateMachine *generalMachine; - QUmlProtocolStateMachine *specificMachine; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPROTOCOLCONFORMANCE_P_H - diff --git a/src/uml/qumlprotocolstatemachine.cpp b/src/uml/qumlprotocolstatemachine.cpp index a0ebb4ca..7ef7b6e8 100644 --- a/src/uml/qumlprotocolstatemachine.cpp +++ b/src/uml/qumlprotocolstatemachine.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlprotocolstatemachine.h" -#include "qumlprotocolstatemachine_p.h" #include <QtUml/QUmlProtocolConformance> QT_BEGIN_NAMESPACE -QUmlProtocolStateMachinePrivate::QUmlProtocolStateMachinePrivate() -{ -} - /*! \class QUmlProtocolStateMachine @@ -57,11 +52,8 @@ QUmlProtocolStateMachinePrivate::QUmlProtocolStateMachinePrivate() \brief A protocol state machine is always defined in the context of a classifier. It specifies which operations of the classifier can be called in which state and under which condition, thus specifying the allowed call sequences on the classifier's operations. A protocol state machine presents the possible and permitted transitions on the instances of its context classifier, together with the operations which carry the transitions. In this manner, an instance lifecycle can be created for a classifier, by specifying the order in which the operations can be activated and the states through which an instance progresses during its existence. */ -QUmlProtocolStateMachine::QUmlProtocolStateMachine(bool create_d_ptr) : - QUmlStateMachine(false) +QUmlProtocolStateMachine::QUmlProtocolStateMachine() { - if (create_d_ptr) - set_d_ptr(new QUmlProtocolStateMachinePrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QSet<QUmlProtocolConformance *> QUmlProtocolStateMachine::conformance() const { // This is a read-write association end - QM_D(const QUmlProtocolStateMachine); - return d->conformance; + return _conformance; } void QUmlProtocolStateMachine::addConformance(QUmlProtocolConformance *conformance) { // This is a read-write association end - QM_D(QUmlProtocolStateMachine); - if (!d->conformance.contains(conformance)) { - d->conformance.insert(conformance); + if (!_conformance.contains(conformance)) { + _conformance.insert(conformance); } } @@ -91,9 +81,8 @@ void QUmlProtocolStateMachine::removeConformance(QUmlProtocolConformance *confor { // This is a read-write association end - QM_D(QUmlProtocolStateMachine); - if (d->conformance.contains(conformance)) { - d->conformance.remove(conformance); + if (_conformance.contains(conformance)) { + _conformance.remove(conformance); } } diff --git a/src/uml/qumlprotocolstatemachine.h b/src/uml/qumlprotocolstatemachine.h index 689c4dfe..2cab49c8 100644 --- a/src/uml/qumlprotocolstatemachine.h +++ b/src/uml/qumlprotocolstatemachine.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlProtocolConformance; -class QUmlProtocolStateMachinePrivate; class Q_UML_EXPORT QUmlProtocolStateMachine : public QUmlStateMachine { public: - QUmlProtocolStateMachine(bool create_d_ptr = true); + QUmlProtocolStateMachine(); // Owned attributes QSet<QUmlProtocolConformance *> conformance() const; void addConformance(QUmlProtocolConformance *conformance); void removeConformance(QUmlProtocolConformance *conformance); + +protected: + QSet<QUmlProtocolConformance *> _conformance; }; QT_END_NAMESPACE diff --git a/src/uml/qumlprotocolstatemachine_p.h b/src/uml/qumlprotocolstatemachine_p.h deleted file mode 100644 index ba472d56..00000000 --- a/src/uml/qumlprotocolstatemachine_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPROTOCOLSTATEMACHINE_P_H -#define QUMLPROTOCOLSTATEMACHINE_P_H - -#include "QtUml/QUmlProtocolStateMachine" - -#include "private/qumlstatemachine_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlProtocolStateMachinePrivate : public QUmlStateMachinePrivate -{ -public: - QUmlProtocolStateMachinePrivate(); - - QSet<QUmlProtocolConformance *> conformance; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPROTOCOLSTATEMACHINE_P_H - diff --git a/src/uml/qumlprotocoltransition.cpp b/src/uml/qumlprotocoltransition.cpp index fb249e72..9d6df0f0 100644 --- a/src/uml/qumlprotocoltransition.cpp +++ b/src/uml/qumlprotocoltransition.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlprotocoltransition.h" -#include "qumlprotocoltransition_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlOperation> QT_BEGIN_NAMESPACE -QUmlProtocolTransitionPrivate::QUmlProtocolTransitionPrivate() : - postCondition(0), - preCondition(0) -{ -} - /*! \class QUmlProtocolTransition @@ -60,11 +53,10 @@ QUmlProtocolTransitionPrivate::QUmlProtocolTransitionPrivate() : \brief A protocol transition specifies a legal transition for an operation. Transitions of protocol state machines have the following information: a pre condition (guard), on trigger, and a post condition. Every protocol transition is associated to zero or one operation (referred BehavioralFeature) that belongs to the context classifier of the protocol state machine. */ -QUmlProtocolTransition::QUmlProtocolTransition(bool create_d_ptr) : - QUmlTransition(false) +QUmlProtocolTransition::QUmlProtocolTransition() : + _postCondition(0), + _preCondition(0) { - if (create_d_ptr) - set_d_ptr(new QUmlProtocolTransitionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlConstraint *QUmlProtocolTransition::postCondition() const { // This is a read-write association end - QM_D(const QUmlProtocolTransition); - return d->postCondition; + return _postCondition; } void QUmlProtocolTransition::setPostCondition(QUmlConstraint *postCondition) { // This is a read-write association end - QM_D(QUmlProtocolTransition); - if (d->postCondition != postCondition) { - d->postCondition = postCondition; + if (_postCondition != postCondition) { + _postCondition = postCondition; } } @@ -97,17 +87,15 @@ QUmlConstraint *QUmlProtocolTransition::preCondition() const { // This is a read-write association end - QM_D(const QUmlProtocolTransition); - return d->preCondition; + return _preCondition; } void QUmlProtocolTransition::setPreCondition(QUmlConstraint *preCondition) { // This is a read-write association end - QM_D(QUmlProtocolTransition); - if (d->preCondition != preCondition) { - d->preCondition = preCondition; + if (_preCondition != preCondition) { + _preCondition = preCondition; } } diff --git a/src/uml/qumlprotocoltransition.h b/src/uml/qumlprotocoltransition.h index 06a11551..4d91d416 100644 --- a/src/uml/qumlprotocoltransition.h +++ b/src/uml/qumlprotocoltransition.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlConstraint; class QUmlOperation; -class QUmlProtocolTransitionPrivate; class Q_UML_EXPORT QUmlProtocolTransition : public QUmlTransition { public: - QUmlProtocolTransition(bool create_d_ptr = true); + QUmlProtocolTransition(); // Owned attributes QUmlConstraint *postCondition() const; @@ -66,6 +65,10 @@ public: QUmlConstraint *preCondition() const; void setPreCondition(QUmlConstraint *preCondition); QSet<QUmlOperation *> referred() const; + +protected: + QUmlConstraint *_postCondition; + QUmlConstraint *_preCondition; }; QT_END_NAMESPACE diff --git a/src/uml/qumlprotocoltransition_p.h b/src/uml/qumlprotocoltransition_p.h deleted file mode 100644 index df25b34f..00000000 --- a/src/uml/qumlprotocoltransition_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPROTOCOLTRANSITION_P_H -#define QUMLPROTOCOLTRANSITION_P_H - -#include "QtUml/QUmlProtocolTransition" - -#include "private/qumltransition_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlProtocolTransitionPrivate : public QUmlTransitionPrivate -{ -public: - QUmlProtocolTransitionPrivate(); - - QUmlConstraint *postCondition; - QUmlConstraint *preCondition; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPROTOCOLTRANSITION_P_H - diff --git a/src/uml/qumlpseudostate.cpp b/src/uml/qumlpseudostate.cpp index 65e44142..ad5bc471 100644 --- a/src/uml/qumlpseudostate.cpp +++ b/src/uml/qumlpseudostate.cpp @@ -39,20 +39,12 @@ ** ****************************************************************************/ #include "qumlpseudostate.h" -#include "qumlpseudostate_p.h" #include <QtUml/QUmlState> #include <QtUml/QUmlStateMachine> QT_BEGIN_NAMESPACE -QUmlPseudostatePrivate::QUmlPseudostatePrivate() : - kind(QtUml::PseudostateInitial), - state(0), - stateMachine(0) -{ -} - /*! \class QUmlPseudostate @@ -61,11 +53,11 @@ QUmlPseudostatePrivate::QUmlPseudostatePrivate() : \brief A pseudostate is an abstraction that encompasses different types of transient vertices in the state machine graph. */ -QUmlPseudostate::QUmlPseudostate(bool create_d_ptr) : - QUmlVertex(false) +QUmlPseudostate::QUmlPseudostate() : + _kind(QtUml::PseudostateInitial), + _state(0), + _stateMachine(0) { - if (create_d_ptr) - set_d_ptr(new QUmlPseudostatePrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QtUml::PseudostateKind QUmlPseudostate::kind() const { // This is a read-write property - QM_D(const QUmlPseudostate); - return d->kind; + return _kind; } void QUmlPseudostate::setKind(QtUml::PseudostateKind kind) { // This is a read-write property - QM_D(QUmlPseudostate); - if (d->kind != kind) { - d->kind = kind; + if (_kind != kind) { + _kind = kind; } } @@ -98,17 +88,15 @@ QUmlState *QUmlPseudostate::state() const { // This is a read-write association end - QM_D(const QUmlPseudostate); - return d->state; + return _state; } void QUmlPseudostate::setState(QUmlState *state) { // This is a read-write association end - QM_D(QUmlPseudostate); - if (d->state != state) { - d->state = state; + if (_state != state) { + _state = state; } } @@ -119,17 +107,15 @@ QUmlStateMachine *QUmlPseudostate::stateMachine() const { // This is a read-write association end - QM_D(const QUmlPseudostate); - return d->stateMachine; + return _stateMachine; } void QUmlPseudostate::setStateMachine(QUmlStateMachine *stateMachine) { // This is a read-write association end - QM_D(QUmlPseudostate); - if (d->stateMachine != stateMachine) { - d->stateMachine = stateMachine; + if (_stateMachine != stateMachine) { + _stateMachine = stateMachine; } } diff --git a/src/uml/qumlpseudostate.h b/src/uml/qumlpseudostate.h index 5c55a70e..ee9949f1 100644 --- a/src/uml/qumlpseudostate.h +++ b/src/uml/qumlpseudostate.h @@ -55,11 +55,10 @@ QT_MODULE(QtUml) class QUmlState; class QUmlStateMachine; -class QUmlPseudostatePrivate; class Q_UML_EXPORT QUmlPseudostate : public QUmlVertex { public: - QUmlPseudostate(bool create_d_ptr = true); + QUmlPseudostate(); // Owned attributes QtUml::PseudostateKind kind() const; @@ -68,6 +67,11 @@ public: void setState(QUmlState *state); QUmlStateMachine *stateMachine() const; void setStateMachine(QUmlStateMachine *stateMachine); + +protected: + QtUml::PseudostateKind _kind; + QUmlState *_state; + QUmlStateMachine *_stateMachine; }; QT_END_NAMESPACE diff --git a/src/uml/qumlpseudostate_p.h b/src/uml/qumlpseudostate_p.h deleted file mode 100644 index 4bc9b752..00000000 --- a/src/uml/qumlpseudostate_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLPSEUDOSTATE_P_H -#define QUMLPSEUDOSTATE_P_H - -#include "QtUml/QUmlPseudostate" - -#include "private/qumlvertex_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlPseudostatePrivate : public QUmlVertexPrivate -{ -public: - QUmlPseudostatePrivate(); - - QtUml::PseudostateKind kind; - QUmlState *state; - QUmlStateMachine *stateMachine; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLPSEUDOSTATE_P_H - diff --git a/src/uml/qumlqualifiervalue.cpp b/src/uml/qumlqualifiervalue.cpp index fcb4565b..718e8d42 100644 --- a/src/uml/qumlqualifiervalue.cpp +++ b/src/uml/qumlqualifiervalue.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlqualifiervalue.h" -#include "qumlqualifiervalue_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlProperty> QT_BEGIN_NAMESPACE -QUmlQualifierValuePrivate::QUmlQualifierValuePrivate() : - qualifier(0), - value(0) -{ -} - /*! \class QUmlQualifierValue @@ -60,11 +53,10 @@ QUmlQualifierValuePrivate::QUmlQualifierValuePrivate() : \brief A qualifier value is not an action. It is an element that identifies links. It gives a single qualifier within a link end data specification. */ -QUmlQualifierValue::QUmlQualifierValue(bool create_d_ptr) : - QUmlElement(false) +QUmlQualifierValue::QUmlQualifierValue() : + _qualifier(0), + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlQualifierValuePrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlProperty *QUmlQualifierValue::qualifier() const { // This is a read-write association end - QM_D(const QUmlQualifierValue); - return d->qualifier; + return _qualifier; } void QUmlQualifierValue::setQualifier(QUmlProperty *qualifier) { // This is a read-write association end - QM_D(QUmlQualifierValue); - if (d->qualifier != qualifier) { - d->qualifier = qualifier; + if (_qualifier != qualifier) { + _qualifier = qualifier; } } @@ -97,17 +87,15 @@ QUmlInputPin *QUmlQualifierValue::value() const { // This is a read-write association end - QM_D(const QUmlQualifierValue); - return d->value; + return _value; } void QUmlQualifierValue::setValue(QUmlInputPin *value) { // This is a read-write association end - QM_D(QUmlQualifierValue); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlqualifiervalue.h b/src/uml/qumlqualifiervalue.h index 4d12f455..edcdfe80 100644 --- a/src/uml/qumlqualifiervalue.h +++ b/src/uml/qumlqualifiervalue.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlProperty; -class QUmlQualifierValuePrivate; class Q_UML_EXPORT QUmlQualifierValue : public QUmlElement { public: - QUmlQualifierValue(bool create_d_ptr = true); + QUmlQualifierValue(); // Owned attributes QUmlProperty *qualifier() const; void setQualifier(QUmlProperty *qualifier); QUmlInputPin *value() const; void setValue(QUmlInputPin *value); + +protected: + QUmlProperty *_qualifier; + QUmlInputPin *_value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlqualifiervalue_p.h b/src/uml/qumlqualifiervalue_p.h deleted file mode 100644 index e78ee7d4..00000000 --- a/src/uml/qumlqualifiervalue_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLQUALIFIERVALUE_P_H -#define QUMLQUALIFIERVALUE_P_H - -#include "QtUml/QUmlQualifierValue" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlQualifierValuePrivate : public QUmlElementPrivate -{ -public: - QUmlQualifierValuePrivate(); - - QUmlProperty *qualifier; - QUmlInputPin *value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLQUALIFIERVALUE_P_H - diff --git a/src/uml/qumlraiseexceptionaction.cpp b/src/uml/qumlraiseexceptionaction.cpp index f74e2f7f..2a00318e 100644 --- a/src/uml/qumlraiseexceptionaction.cpp +++ b/src/uml/qumlraiseexceptionaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlraiseexceptionaction.h" -#include "qumlraiseexceptionaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlRaiseExceptionActionPrivate::QUmlRaiseExceptionActionPrivate() : - exception(0) -{ -} - /*! \class QUmlRaiseExceptionAction @@ -58,11 +52,9 @@ QUmlRaiseExceptionActionPrivate::QUmlRaiseExceptionActionPrivate() : \brief A raise exception action is an action that causes an exception to occur. The input value becomes the exception object. */ -QUmlRaiseExceptionAction::QUmlRaiseExceptionAction(bool create_d_ptr) : - QUmlAction(false) +QUmlRaiseExceptionAction::QUmlRaiseExceptionAction() : + _exception(0) { - if (create_d_ptr) - set_d_ptr(new QUmlRaiseExceptionActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlInputPin *QUmlRaiseExceptionAction::exception() const { // This is a read-write association end - QM_D(const QUmlRaiseExceptionAction); - return d->exception; + return _exception; } void QUmlRaiseExceptionAction::setException(QUmlInputPin *exception) { // This is a read-write association end - QM_D(QUmlRaiseExceptionAction); - if (d->exception != exception) { - d->exception = exception; + if (_exception != exception) { + _exception = exception; } } diff --git a/src/uml/qumlraiseexceptionaction.h b/src/uml/qumlraiseexceptionaction.h index ddd20a68..7614788c 100644 --- a/src/uml/qumlraiseexceptionaction.h +++ b/src/uml/qumlraiseexceptionaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlRaiseExceptionActionPrivate; class Q_UML_EXPORT QUmlRaiseExceptionAction : public QUmlAction { public: - QUmlRaiseExceptionAction(bool create_d_ptr = true); + QUmlRaiseExceptionAction(); // Owned attributes QUmlInputPin *exception() const; void setException(QUmlInputPin *exception); + +protected: + QUmlInputPin *_exception; }; QT_END_NAMESPACE diff --git a/src/uml/qumlraiseexceptionaction_p.h b/src/uml/qumlraiseexceptionaction_p.h deleted file mode 100644 index 8e3bb1e0..00000000 --- a/src/uml/qumlraiseexceptionaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLRAISEEXCEPTIONACTION_P_H -#define QUMLRAISEEXCEPTIONACTION_P_H - -#include "QtUml/QUmlRaiseExceptionAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRaiseExceptionActionPrivate : public QUmlActionPrivate -{ -public: - QUmlRaiseExceptionActionPrivate(); - - QUmlInputPin *exception; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLRAISEEXCEPTIONACTION_P_H - diff --git a/src/uml/qumlreadextentaction.cpp b/src/uml/qumlreadextentaction.cpp index f3c4ccc2..7a747fcd 100644 --- a/src/uml/qumlreadextentaction.cpp +++ b/src/uml/qumlreadextentaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlreadextentaction.h" -#include "qumlreadextentaction_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlReadExtentActionPrivate::QUmlReadExtentActionPrivate() : - classifier(0), - result(0) -{ -} - /*! \class QUmlReadExtentAction @@ -60,11 +53,10 @@ QUmlReadExtentActionPrivate::QUmlReadExtentActionPrivate() : \brief A read extent action is an action that retrieves the current instances of a classifier. */ -QUmlReadExtentAction::QUmlReadExtentAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReadExtentAction::QUmlReadExtentAction() : + _classifier(0), + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadExtentActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlClassifier *QUmlReadExtentAction::classifier() const { // This is a read-write association end - QM_D(const QUmlReadExtentAction); - return d->classifier; + return _classifier; } void QUmlReadExtentAction::setClassifier(QUmlClassifier *classifier) { // This is a read-write association end - QM_D(QUmlReadExtentAction); - if (d->classifier != classifier) { - d->classifier = classifier; + if (_classifier != classifier) { + _classifier = classifier; } } @@ -97,17 +87,15 @@ QUmlOutputPin *QUmlReadExtentAction::result() const { // This is a read-write association end - QM_D(const QUmlReadExtentAction); - return d->result; + return _result; } void QUmlReadExtentAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadExtentAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadextentaction.h b/src/uml/qumlreadextentaction.h index 9777167a..5abd2ee5 100644 --- a/src/uml/qumlreadextentaction.h +++ b/src/uml/qumlreadextentaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlClassifier; class QUmlOutputPin; -class QUmlReadExtentActionPrivate; class Q_UML_EXPORT QUmlReadExtentAction : public QUmlAction { public: - QUmlReadExtentAction(bool create_d_ptr = true); + QUmlReadExtentAction(); // Owned attributes QUmlClassifier *classifier() const; void setClassifier(QUmlClassifier *classifier); QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlClassifier *_classifier; + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadextentaction_p.h b/src/uml/qumlreadextentaction_p.h deleted file mode 100644 index b23bba51..00000000 --- a/src/uml/qumlreadextentaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADEXTENTACTION_P_H -#define QUMLREADEXTENTACTION_P_H - -#include "QtUml/QUmlReadExtentAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadExtentActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReadExtentActionPrivate(); - - QUmlClassifier *classifier; - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADEXTENTACTION_P_H - diff --git a/src/uml/qumlreadisclassifiedobjectaction.cpp b/src/uml/qumlreadisclassifiedobjectaction.cpp index c9bdc7ff..7a92fa01 100644 --- a/src/uml/qumlreadisclassifiedobjectaction.cpp +++ b/src/uml/qumlreadisclassifiedobjectaction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlreadisclassifiedobjectaction.h" -#include "qumlreadisclassifiedobjectaction_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlInputPin> @@ -47,14 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlReadIsClassifiedObjectActionPrivate::QUmlReadIsClassifiedObjectActionPrivate() : - classifier(0), - isDirect(false), - object(0), - result(0) -{ -} - /*! \class QUmlReadIsClassifiedObjectAction @@ -63,11 +54,12 @@ QUmlReadIsClassifiedObjectActionPrivate::QUmlReadIsClassifiedObjectActionPrivate \brief A read is classified object action is an action that determines whether a runtime object is classified by a given classifier. */ -QUmlReadIsClassifiedObjectAction::QUmlReadIsClassifiedObjectAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReadIsClassifiedObjectAction::QUmlReadIsClassifiedObjectAction() : + _classifier(0), + _isDirect(false), + _object(0), + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadIsClassifiedObjectActionPrivate); } // OWNED ATTRIBUTES @@ -79,17 +71,15 @@ QUmlClassifier *QUmlReadIsClassifiedObjectAction::classifier() const { // This is a read-write association end - QM_D(const QUmlReadIsClassifiedObjectAction); - return d->classifier; + return _classifier; } void QUmlReadIsClassifiedObjectAction::setClassifier(QUmlClassifier *classifier) { // This is a read-write association end - QM_D(QUmlReadIsClassifiedObjectAction); - if (d->classifier != classifier) { - d->classifier = classifier; + if (_classifier != classifier) { + _classifier = classifier; } } @@ -100,17 +90,15 @@ bool QUmlReadIsClassifiedObjectAction::isDirect() const { // This is a read-write property - QM_D(const QUmlReadIsClassifiedObjectAction); - return d->isDirect; + return _isDirect; } void QUmlReadIsClassifiedObjectAction::setDirect(bool isDirect) { // This is a read-write property - QM_D(QUmlReadIsClassifiedObjectAction); - if (d->isDirect != isDirect) { - d->isDirect = isDirect; + if (_isDirect != isDirect) { + _isDirect = isDirect; } } @@ -121,17 +109,15 @@ QUmlInputPin *QUmlReadIsClassifiedObjectAction::object() const { // This is a read-write association end - QM_D(const QUmlReadIsClassifiedObjectAction); - return d->object; + return _object; } void QUmlReadIsClassifiedObjectAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlReadIsClassifiedObjectAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } @@ -142,17 +128,15 @@ QUmlOutputPin *QUmlReadIsClassifiedObjectAction::result() const { // This is a read-write association end - QM_D(const QUmlReadIsClassifiedObjectAction); - return d->result; + return _result; } void QUmlReadIsClassifiedObjectAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadIsClassifiedObjectAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadisclassifiedobjectaction.h b/src/uml/qumlreadisclassifiedobjectaction.h index a8b2a6f2..76a43689 100644 --- a/src/uml/qumlreadisclassifiedobjectaction.h +++ b/src/uml/qumlreadisclassifiedobjectaction.h @@ -55,11 +55,10 @@ class QUmlClassifier; class QUmlInputPin; class QUmlOutputPin; -class QUmlReadIsClassifiedObjectActionPrivate; class Q_UML_EXPORT QUmlReadIsClassifiedObjectAction : public QUmlAction { public: - QUmlReadIsClassifiedObjectAction(bool create_d_ptr = true); + QUmlReadIsClassifiedObjectAction(); // Owned attributes QUmlClassifier *classifier() const; @@ -70,6 +69,12 @@ public: void setObject(QUmlInputPin *object); QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlClassifier *_classifier; + bool _isDirect; + QUmlInputPin *_object; + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadisclassifiedobjectaction_p.h b/src/uml/qumlreadisclassifiedobjectaction_p.h deleted file mode 100644 index 6300c644..00000000 --- a/src/uml/qumlreadisclassifiedobjectaction_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADISCLASSIFIEDOBJECTACTION_P_H -#define QUMLREADISCLASSIFIEDOBJECTACTION_P_H - -#include "QtUml/QUmlReadIsClassifiedObjectAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadIsClassifiedObjectActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReadIsClassifiedObjectActionPrivate(); - - QUmlClassifier *classifier; - bool isDirect; - QUmlInputPin *object; - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADISCLASSIFIEDOBJECTACTION_P_H - diff --git a/src/uml/qumlreadlinkaction.cpp b/src/uml/qumlreadlinkaction.cpp index 2b9a0ccd..04debf15 100644 --- a/src/uml/qumlreadlinkaction.cpp +++ b/src/uml/qumlreadlinkaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlreadlinkaction.h" -#include "qumlreadlinkaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlReadLinkActionPrivate::QUmlReadLinkActionPrivate() : - result(0) -{ -} - /*! \class QUmlReadLinkAction @@ -58,11 +52,9 @@ QUmlReadLinkActionPrivate::QUmlReadLinkActionPrivate() : \brief A read link action is a link action that navigates across associations to retrieve objects on one end. */ -QUmlReadLinkAction::QUmlReadLinkAction(bool create_d_ptr) : - QUmlLinkAction(false) +QUmlReadLinkAction::QUmlReadLinkAction() : + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadLinkActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOutputPin *QUmlReadLinkAction::result() const { // This is a read-write association end - QM_D(const QUmlReadLinkAction); - return d->result; + return _result; } void QUmlReadLinkAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadLinkAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadlinkaction.h b/src/uml/qumlreadlinkaction.h index dcfc25a9..cb181c94 100644 --- a/src/uml/qumlreadlinkaction.h +++ b/src/uml/qumlreadlinkaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlReadLinkActionPrivate; class Q_UML_EXPORT QUmlReadLinkAction : public QUmlLinkAction { public: - QUmlReadLinkAction(bool create_d_ptr = true); + QUmlReadLinkAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadlinkaction_p.h b/src/uml/qumlreadlinkaction_p.h deleted file mode 100644 index 2e3ebf3a..00000000 --- a/src/uml/qumlreadlinkaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADLINKACTION_P_H -#define QUMLREADLINKACTION_P_H - -#include "QtUml/QUmlReadLinkAction" - -#include "private/qumllinkaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadLinkActionPrivate : public QUmlLinkActionPrivate -{ -public: - QUmlReadLinkActionPrivate(); - - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADLINKACTION_P_H - diff --git a/src/uml/qumlreadlinkobjectendaction.cpp b/src/uml/qumlreadlinkobjectendaction.cpp index c07bad04..c9c263c2 100644 --- a/src/uml/qumlreadlinkobjectendaction.cpp +++ b/src/uml/qumlreadlinkobjectendaction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlreadlinkobjectendaction.h" -#include "qumlreadlinkobjectendaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> @@ -47,13 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlReadLinkObjectEndActionPrivate::QUmlReadLinkObjectEndActionPrivate() : - end(0), - object(0), - result(0) -{ -} - /*! \class QUmlReadLinkObjectEndAction @@ -62,11 +54,11 @@ QUmlReadLinkObjectEndActionPrivate::QUmlReadLinkObjectEndActionPrivate() : \brief A read link object end action is an action that retrieves an end object from a link object. */ -QUmlReadLinkObjectEndAction::QUmlReadLinkObjectEndAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReadLinkObjectEndAction::QUmlReadLinkObjectEndAction() : + _end(0), + _object(0), + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadLinkObjectEndActionPrivate); } // OWNED ATTRIBUTES @@ -78,17 +70,15 @@ QUmlProperty *QUmlReadLinkObjectEndAction::end() const { // This is a read-write association end - QM_D(const QUmlReadLinkObjectEndAction); - return d->end; + return _end; } void QUmlReadLinkObjectEndAction::setEnd(QUmlProperty *end) { // This is a read-write association end - QM_D(QUmlReadLinkObjectEndAction); - if (d->end != end) { - d->end = end; + if (_end != end) { + _end = end; } } @@ -99,17 +89,15 @@ QUmlInputPin *QUmlReadLinkObjectEndAction::object() const { // This is a read-write association end - QM_D(const QUmlReadLinkObjectEndAction); - return d->object; + return _object; } void QUmlReadLinkObjectEndAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlReadLinkObjectEndAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } @@ -120,17 +108,15 @@ QUmlOutputPin *QUmlReadLinkObjectEndAction::result() const { // This is a read-write association end - QM_D(const QUmlReadLinkObjectEndAction); - return d->result; + return _result; } void QUmlReadLinkObjectEndAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadLinkObjectEndAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadlinkobjectendaction.h b/src/uml/qumlreadlinkobjectendaction.h index c49c7fa4..e8bc7e96 100644 --- a/src/uml/qumlreadlinkobjectendaction.h +++ b/src/uml/qumlreadlinkobjectendaction.h @@ -55,11 +55,10 @@ class QUmlInputPin; class QUmlOutputPin; class QUmlProperty; -class QUmlReadLinkObjectEndActionPrivate; class Q_UML_EXPORT QUmlReadLinkObjectEndAction : public QUmlAction { public: - QUmlReadLinkObjectEndAction(bool create_d_ptr = true); + QUmlReadLinkObjectEndAction(); // Owned attributes QUmlProperty *end() const; @@ -68,6 +67,11 @@ public: void setObject(QUmlInputPin *object); QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlProperty *_end; + QUmlInputPin *_object; + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadlinkobjectendaction_p.h b/src/uml/qumlreadlinkobjectendaction_p.h deleted file mode 100644 index 10d0abbb..00000000 --- a/src/uml/qumlreadlinkobjectendaction_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADLINKOBJECTENDACTION_P_H -#define QUMLREADLINKOBJECTENDACTION_P_H - -#include "QtUml/QUmlReadLinkObjectEndAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadLinkObjectEndActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReadLinkObjectEndActionPrivate(); - - QUmlProperty *end; - QUmlInputPin *object; - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADLINKOBJECTENDACTION_P_H - diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.cpp b/src/uml/qumlreadlinkobjectendqualifieraction.cpp index 998c5c81..bd99ffc4 100644 --- a/src/uml/qumlreadlinkobjectendqualifieraction.cpp +++ b/src/uml/qumlreadlinkobjectendqualifieraction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlreadlinkobjectendqualifieraction.h" -#include "qumlreadlinkobjectendqualifieraction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> @@ -47,13 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlReadLinkObjectEndQualifierActionPrivate::QUmlReadLinkObjectEndQualifierActionPrivate() : - object(0), - qualifier(0), - result(0) -{ -} - /*! \class QUmlReadLinkObjectEndQualifierAction @@ -62,11 +54,11 @@ QUmlReadLinkObjectEndQualifierActionPrivate::QUmlReadLinkObjectEndQualifierActio \brief A read link object end qualifier action is an action that retrieves a qualifier end value from a link object. */ -QUmlReadLinkObjectEndQualifierAction::QUmlReadLinkObjectEndQualifierAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReadLinkObjectEndQualifierAction::QUmlReadLinkObjectEndQualifierAction() : + _object(0), + _qualifier(0), + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadLinkObjectEndQualifierActionPrivate); } // OWNED ATTRIBUTES @@ -78,17 +70,15 @@ QUmlInputPin *QUmlReadLinkObjectEndQualifierAction::object() const { // This is a read-write association end - QM_D(const QUmlReadLinkObjectEndQualifierAction); - return d->object; + return _object; } void QUmlReadLinkObjectEndQualifierAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlReadLinkObjectEndQualifierAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } @@ -99,17 +89,15 @@ QUmlProperty *QUmlReadLinkObjectEndQualifierAction::qualifier() const { // This is a read-write association end - QM_D(const QUmlReadLinkObjectEndQualifierAction); - return d->qualifier; + return _qualifier; } void QUmlReadLinkObjectEndQualifierAction::setQualifier(QUmlProperty *qualifier) { // This is a read-write association end - QM_D(QUmlReadLinkObjectEndQualifierAction); - if (d->qualifier != qualifier) { - d->qualifier = qualifier; + if (_qualifier != qualifier) { + _qualifier = qualifier; } } @@ -120,17 +108,15 @@ QUmlOutputPin *QUmlReadLinkObjectEndQualifierAction::result() const { // This is a read-write association end - QM_D(const QUmlReadLinkObjectEndQualifierAction); - return d->result; + return _result; } void QUmlReadLinkObjectEndQualifierAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadLinkObjectEndQualifierAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadlinkobjectendqualifieraction.h b/src/uml/qumlreadlinkobjectendqualifieraction.h index 306415cc..c6723c39 100644 --- a/src/uml/qumlreadlinkobjectendqualifieraction.h +++ b/src/uml/qumlreadlinkobjectendqualifieraction.h @@ -55,11 +55,10 @@ class QUmlInputPin; class QUmlOutputPin; class QUmlProperty; -class QUmlReadLinkObjectEndQualifierActionPrivate; class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierAction : public QUmlAction { public: - QUmlReadLinkObjectEndQualifierAction(bool create_d_ptr = true); + QUmlReadLinkObjectEndQualifierAction(); // Owned attributes QUmlInputPin *object() const; @@ -68,6 +67,11 @@ public: void setQualifier(QUmlProperty *qualifier); QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlInputPin *_object; + QUmlProperty *_qualifier; + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadlinkobjectendqualifieraction_p.h b/src/uml/qumlreadlinkobjectendqualifieraction_p.h deleted file mode 100644 index d12c2b2d..00000000 --- a/src/uml/qumlreadlinkobjectendqualifieraction_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADLINKOBJECTENDQUALIFIERACTION_P_H -#define QUMLREADLINKOBJECTENDQUALIFIERACTION_P_H - -#include "QtUml/QUmlReadLinkObjectEndQualifierAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadLinkObjectEndQualifierActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReadLinkObjectEndQualifierActionPrivate(); - - QUmlInputPin *object; - QUmlProperty *qualifier; - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADLINKOBJECTENDQUALIFIERACTION_P_H - diff --git a/src/uml/qumlreadselfaction.cpp b/src/uml/qumlreadselfaction.cpp index f43e3013..49932a68 100644 --- a/src/uml/qumlreadselfaction.cpp +++ b/src/uml/qumlreadselfaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlreadselfaction.h" -#include "qumlreadselfaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlReadSelfActionPrivate::QUmlReadSelfActionPrivate() : - result(0) -{ -} - /*! \class QUmlReadSelfAction @@ -58,11 +52,9 @@ QUmlReadSelfActionPrivate::QUmlReadSelfActionPrivate() : \brief A read self action is an action that retrieves the host object of an action. */ -QUmlReadSelfAction::QUmlReadSelfAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReadSelfAction::QUmlReadSelfAction() : + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadSelfActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOutputPin *QUmlReadSelfAction::result() const { // This is a read-write association end - QM_D(const QUmlReadSelfAction); - return d->result; + return _result; } void QUmlReadSelfAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadSelfAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadselfaction.h b/src/uml/qumlreadselfaction.h index 7ade3950..261ea72a 100644 --- a/src/uml/qumlreadselfaction.h +++ b/src/uml/qumlreadselfaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlReadSelfActionPrivate; class Q_UML_EXPORT QUmlReadSelfAction : public QUmlAction { public: - QUmlReadSelfAction(bool create_d_ptr = true); + QUmlReadSelfAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadselfaction_p.h b/src/uml/qumlreadselfaction_p.h deleted file mode 100644 index 14dd4e20..00000000 --- a/src/uml/qumlreadselfaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADSELFACTION_P_H -#define QUMLREADSELFACTION_P_H - -#include "QtUml/QUmlReadSelfAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadSelfActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReadSelfActionPrivate(); - - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADSELFACTION_P_H - diff --git a/src/uml/qumlreadstructuralfeatureaction.cpp b/src/uml/qumlreadstructuralfeatureaction.cpp index af05781d..e7479040 100644 --- a/src/uml/qumlreadstructuralfeatureaction.cpp +++ b/src/uml/qumlreadstructuralfeatureaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlreadstructuralfeatureaction.h" -#include "qumlreadstructuralfeatureaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlReadStructuralFeatureActionPrivate::QUmlReadStructuralFeatureActionPrivate() : - result(0) -{ -} - /*! \class QUmlReadStructuralFeatureAction @@ -58,11 +52,9 @@ QUmlReadStructuralFeatureActionPrivate::QUmlReadStructuralFeatureActionPrivate() \brief A read structural feature action is a structural feature action that retrieves the values of a structural feature. */ -QUmlReadStructuralFeatureAction::QUmlReadStructuralFeatureAction(bool create_d_ptr) : - QUmlStructuralFeatureAction(false) +QUmlReadStructuralFeatureAction::QUmlReadStructuralFeatureAction() : + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadStructuralFeatureActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOutputPin *QUmlReadStructuralFeatureAction::result() const { // This is a read-write association end - QM_D(const QUmlReadStructuralFeatureAction); - return d->result; + return _result; } void QUmlReadStructuralFeatureAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadStructuralFeatureAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadstructuralfeatureaction.h b/src/uml/qumlreadstructuralfeatureaction.h index 53f7b46e..c7c49a33 100644 --- a/src/uml/qumlreadstructuralfeatureaction.h +++ b/src/uml/qumlreadstructuralfeatureaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlReadStructuralFeatureActionPrivate; class Q_UML_EXPORT QUmlReadStructuralFeatureAction : public QUmlStructuralFeatureAction { public: - QUmlReadStructuralFeatureAction(bool create_d_ptr = true); + QUmlReadStructuralFeatureAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadstructuralfeatureaction_p.h b/src/uml/qumlreadstructuralfeatureaction_p.h deleted file mode 100644 index 10047f33..00000000 --- a/src/uml/qumlreadstructuralfeatureaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADSTRUCTURALFEATUREACTION_P_H -#define QUMLREADSTRUCTURALFEATUREACTION_P_H - -#include "QtUml/QUmlReadStructuralFeatureAction" - -#include "private/qumlstructuralfeatureaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadStructuralFeatureActionPrivate : public QUmlStructuralFeatureActionPrivate -{ -public: - QUmlReadStructuralFeatureActionPrivate(); - - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADSTRUCTURALFEATUREACTION_P_H - diff --git a/src/uml/qumlreadvariableaction.cpp b/src/uml/qumlreadvariableaction.cpp index 10154965..b4a2a6f9 100644 --- a/src/uml/qumlreadvariableaction.cpp +++ b/src/uml/qumlreadvariableaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlreadvariableaction.h" -#include "qumlreadvariableaction_p.h" #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlReadVariableActionPrivate::QUmlReadVariableActionPrivate() : - result(0) -{ -} - /*! \class QUmlReadVariableAction @@ -58,11 +52,9 @@ QUmlReadVariableActionPrivate::QUmlReadVariableActionPrivate() : \brief A read variable action is a variable action that retrieves the values of a variable. */ -QUmlReadVariableAction::QUmlReadVariableAction(bool create_d_ptr) : - QUmlVariableAction(false) +QUmlReadVariableAction::QUmlReadVariableAction() : + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReadVariableActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlOutputPin *QUmlReadVariableAction::result() const { // This is a read-write association end - QM_D(const QUmlReadVariableAction); - return d->result; + return _result; } void QUmlReadVariableAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReadVariableAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreadvariableaction.h b/src/uml/qumlreadvariableaction.h index c2d2955e..3cde0609 100644 --- a/src/uml/qumlreadvariableaction.h +++ b/src/uml/qumlreadvariableaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlOutputPin; -class QUmlReadVariableActionPrivate; class Q_UML_EXPORT QUmlReadVariableAction : public QUmlVariableAction { public: - QUmlReadVariableAction(bool create_d_ptr = true); + QUmlReadVariableAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreadvariableaction_p.h b/src/uml/qumlreadvariableaction_p.h deleted file mode 100644 index a13fc6b7..00000000 --- a/src/uml/qumlreadvariableaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREADVARIABLEACTION_P_H -#define QUMLREADVARIABLEACTION_P_H - -#include "QtUml/QUmlReadVariableAction" - -#include "private/qumlvariableaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReadVariableActionPrivate : public QUmlVariableActionPrivate -{ -public: - QUmlReadVariableActionPrivate(); - - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREADVARIABLEACTION_P_H - diff --git a/src/uml/qumlrealization.cpp b/src/uml/qumlrealization.cpp index 3fbae41c..bfb56bf3 100644 --- a/src/uml/qumlrealization.cpp +++ b/src/uml/qumlrealization.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlrealization.h" -#include "qumlrealization_p.h" QT_BEGIN_NAMESPACE -QUmlRealizationPrivate::QUmlRealizationPrivate() -{ -} - /*! \class QUmlRealization @@ -55,11 +50,8 @@ QUmlRealizationPrivate::QUmlRealizationPrivate() \brief Realization is a specialized abstraction relationship between two sets of model elements, one representing a specification (the supplier) and the other represents an implementation of the latter (the client). Realization can be used to model stepwise refinement, optimizations, transformations, templates, model synthesis, framework composition, etc. */ -QUmlRealization::QUmlRealization(bool create_d_ptr) : - QUmlAbstraction(false) +QUmlRealization::QUmlRealization() { - if (create_d_ptr) - set_d_ptr(new QUmlRealizationPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlrealization.h b/src/uml/qumlrealization.h index 6a08a06d..f564f3ea 100644 --- a/src/uml/qumlrealization.h +++ b/src/uml/qumlrealization.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlRealizationPrivate; class Q_UML_EXPORT QUmlRealization : public QUmlAbstraction { public: - QUmlRealization(bool create_d_ptr = true); + QUmlRealization(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlrealization_p.h b/src/uml/qumlrealization_p.h deleted file mode 100644 index 62bb6ebc..00000000 --- a/src/uml/qumlrealization_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREALIZATION_P_H -#define QUMLREALIZATION_P_H - -#include "QtUml/QUmlRealization" - -#include "private/qumlabstraction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRealizationPrivate : public QUmlAbstractionPrivate -{ -public: - QUmlRealizationPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREALIZATION_P_H - diff --git a/src/uml/qumlreception.cpp b/src/uml/qumlreception.cpp index 6e268acd..59614e24 100644 --- a/src/uml/qumlreception.cpp +++ b/src/uml/qumlreception.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlreception.h" -#include "qumlreception_p.h" #include <QtUml/QUmlSignal> QT_BEGIN_NAMESPACE -QUmlReceptionPrivate::QUmlReceptionPrivate() : - signal(0) -{ -} - /*! \class QUmlReception @@ -58,11 +52,9 @@ QUmlReceptionPrivate::QUmlReceptionPrivate() : \brief A reception is a declaration stating that a classifier is prepared to react to the receipt of a signal. A reception designates a signal and specifies the expected behavioral response. The details of handling a signal are specified by the behavior associated with the reception or the classifier itself. */ -QUmlReception::QUmlReception(bool create_d_ptr) : - QUmlBehavioralFeature(false) +QUmlReception::QUmlReception() : + _signal(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReceptionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlSignal *QUmlReception::signal() const { // This is a read-write association end - QM_D(const QUmlReception); - return d->signal; + return _signal; } void QUmlReception::setSignal(QUmlSignal *signal) { // This is a read-write association end - QM_D(QUmlReception); - if (d->signal != signal) { - d->signal = signal; + if (_signal != signal) { + _signal = signal; } } diff --git a/src/uml/qumlreception.h b/src/uml/qumlreception.h index 857bd4a9..5d70cdf4 100644 --- a/src/uml/qumlreception.h +++ b/src/uml/qumlreception.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlSignal; -class QUmlReceptionPrivate; class Q_UML_EXPORT QUmlReception : public QUmlBehavioralFeature { public: - QUmlReception(bool create_d_ptr = true); + QUmlReception(); // Owned attributes QUmlSignal *signal() const; void setSignal(QUmlSignal *signal); + +protected: + QUmlSignal *_signal; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreception_p.h b/src/uml/qumlreception_p.h deleted file mode 100644 index 07ac28e7..00000000 --- a/src/uml/qumlreception_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLRECEPTION_P_H -#define QUMLRECEPTION_P_H - -#include "QtUml/QUmlReception" - -#include "private/qumlbehavioralfeature_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReceptionPrivate : public QUmlBehavioralFeaturePrivate -{ -public: - QUmlReceptionPrivate(); - - QUmlSignal *signal; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLRECEPTION_P_H - diff --git a/src/uml/qumlreclassifyobjectaction.cpp b/src/uml/qumlreclassifyobjectaction.cpp index 39cdd463..7606e924 100644 --- a/src/uml/qumlreclassifyobjectaction.cpp +++ b/src/uml/qumlreclassifyobjectaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlreclassifyobjectaction.h" -#include "qumlreclassifyobjectaction_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlReclassifyObjectActionPrivate::QUmlReclassifyObjectActionPrivate() : - isReplaceAll(false), - object(0) -{ -} - /*! \class QUmlReclassifyObjectAction @@ -60,11 +53,10 @@ QUmlReclassifyObjectActionPrivate::QUmlReclassifyObjectActionPrivate() : \brief A reclassify object action is an action that changes which classifiers classify an object. */ -QUmlReclassifyObjectAction::QUmlReclassifyObjectAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReclassifyObjectAction::QUmlReclassifyObjectAction() : + _isReplaceAll(false), + _object(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReclassifyObjectActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ bool QUmlReclassifyObjectAction::isReplaceAll() const { // This is a read-write property - QM_D(const QUmlReclassifyObjectAction); - return d->isReplaceAll; + return _isReplaceAll; } void QUmlReclassifyObjectAction::setReplaceAll(bool isReplaceAll) { // This is a read-write property - QM_D(QUmlReclassifyObjectAction); - if (d->isReplaceAll != isReplaceAll) { - d->isReplaceAll = isReplaceAll; + if (_isReplaceAll != isReplaceAll) { + _isReplaceAll = isReplaceAll; } } @@ -97,17 +87,15 @@ QSet<QUmlClassifier *> QUmlReclassifyObjectAction::newClassifier() const { // This is a read-write association end - QM_D(const QUmlReclassifyObjectAction); - return d->newClassifier; + return _newClassifier; } void QUmlReclassifyObjectAction::addNewClassifier(QUmlClassifier *newClassifier) { // This is a read-write association end - QM_D(QUmlReclassifyObjectAction); - if (!d->newClassifier.contains(newClassifier)) { - d->newClassifier.insert(newClassifier); + if (!_newClassifier.contains(newClassifier)) { + _newClassifier.insert(newClassifier); } } @@ -115,9 +103,8 @@ void QUmlReclassifyObjectAction::removeNewClassifier(QUmlClassifier *newClassifi { // This is a read-write association end - QM_D(QUmlReclassifyObjectAction); - if (d->newClassifier.contains(newClassifier)) { - d->newClassifier.remove(newClassifier); + if (_newClassifier.contains(newClassifier)) { + _newClassifier.remove(newClassifier); } } @@ -128,17 +115,15 @@ QUmlInputPin *QUmlReclassifyObjectAction::object() const { // This is a read-write association end - QM_D(const QUmlReclassifyObjectAction); - return d->object; + return _object; } void QUmlReclassifyObjectAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlReclassifyObjectAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } @@ -149,17 +134,15 @@ QSet<QUmlClassifier *> QUmlReclassifyObjectAction::oldClassifier() const { // This is a read-write association end - QM_D(const QUmlReclassifyObjectAction); - return d->oldClassifier; + return _oldClassifier; } void QUmlReclassifyObjectAction::addOldClassifier(QUmlClassifier *oldClassifier) { // This is a read-write association end - QM_D(QUmlReclassifyObjectAction); - if (!d->oldClassifier.contains(oldClassifier)) { - d->oldClassifier.insert(oldClassifier); + if (!_oldClassifier.contains(oldClassifier)) { + _oldClassifier.insert(oldClassifier); } } @@ -167,9 +150,8 @@ void QUmlReclassifyObjectAction::removeOldClassifier(QUmlClassifier *oldClassifi { // This is a read-write association end - QM_D(QUmlReclassifyObjectAction); - if (d->oldClassifier.contains(oldClassifier)) { - d->oldClassifier.remove(oldClassifier); + if (_oldClassifier.contains(oldClassifier)) { + _oldClassifier.remove(oldClassifier); } } diff --git a/src/uml/qumlreclassifyobjectaction.h b/src/uml/qumlreclassifyobjectaction.h index 8d5da32d..d7369229 100644 --- a/src/uml/qumlreclassifyobjectaction.h +++ b/src/uml/qumlreclassifyobjectaction.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlClassifier; class QUmlInputPin; -class QUmlReclassifyObjectActionPrivate; class Q_UML_EXPORT QUmlReclassifyObjectAction : public QUmlAction { public: - QUmlReclassifyObjectAction(bool create_d_ptr = true); + QUmlReclassifyObjectAction(); // Owned attributes bool isReplaceAll() const; @@ -71,6 +70,12 @@ public: QSet<QUmlClassifier *> oldClassifier() const; void addOldClassifier(QUmlClassifier *oldClassifier); void removeOldClassifier(QUmlClassifier *oldClassifier); + +protected: + bool _isReplaceAll; + QSet<QUmlClassifier *> _newClassifier; + QUmlInputPin *_object; + QSet<QUmlClassifier *> _oldClassifier; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreclassifyobjectaction_p.h b/src/uml/qumlreclassifyobjectaction_p.h deleted file mode 100644 index 72f130c7..00000000 --- a/src/uml/qumlreclassifyobjectaction_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLRECLASSIFYOBJECTACTION_P_H -#define QUMLRECLASSIFYOBJECTACTION_P_H - -#include "QtUml/QUmlReclassifyObjectAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReclassifyObjectActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReclassifyObjectActionPrivate(); - - bool isReplaceAll; - QSet<QUmlClassifier *> newClassifier; - QUmlInputPin *object; - QSet<QUmlClassifier *> oldClassifier; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLRECLASSIFYOBJECTACTION_P_H - diff --git a/src/uml/qumlredefinableelement.cpp b/src/uml/qumlredefinableelement.cpp index 24b080bc..4fe5102a 100644 --- a/src/uml/qumlredefinableelement.cpp +++ b/src/uml/qumlredefinableelement.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlredefinableelement.h" -#include "qumlredefinableelement_p.h" #include <QtUml/QUmlClassifier> QT_BEGIN_NAMESPACE -QUmlRedefinableElementPrivate::QUmlRedefinableElementPrivate() : - isLeaf(false) -{ -} - /*! \class QUmlRedefinableElement @@ -58,11 +52,9 @@ QUmlRedefinableElementPrivate::QUmlRedefinableElementPrivate() : \brief A redefinable element is an element that, when defined in the context of a classifier, can be redefined more specifically or differently in the context of another classifier that specializes (directly or indirectly) the context classifier. */ -QUmlRedefinableElement::QUmlRedefinableElement(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlRedefinableElement::QUmlRedefinableElement() : + _isLeaf(false) { - if (create_d_ptr) - set_d_ptr(new QUmlRedefinableElementPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ bool QUmlRedefinableElement::isLeaf() const { // This is a read-write property - QM_D(const QUmlRedefinableElement); - return d->isLeaf; + return _isLeaf; } void QUmlRedefinableElement::setLeaf(bool isLeaf) { // This is a read-write property - QM_D(QUmlRedefinableElement); - if (d->isLeaf != isLeaf) { - d->isLeaf = isLeaf; + if (_isLeaf != isLeaf) { + _isLeaf = isLeaf; } } @@ -95,8 +85,7 @@ QSet<QUmlRedefinableElement *> QUmlRedefinableElement::redefinedElement() const { // This is a read-only derived union association end - QM_D(const QUmlRedefinableElement); - return d->redefinedElement; + return _redefinedElement; } /*! @@ -106,8 +95,7 @@ QSet<QUmlClassifier *> QUmlRedefinableElement::redefinitionContext() const { // This is a read-only derived union association end - QM_D(const QUmlRedefinableElement); - return d->redefinitionContext; + return _redefinitionContext; } // OPERATIONS diff --git a/src/uml/qumlredefinableelement.h b/src/uml/qumlredefinableelement.h index ad6eecf4..e21e2c31 100644 --- a/src/uml/qumlredefinableelement.h +++ b/src/uml/qumlredefinableelement.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlClassifier; -class QUmlRedefinableElementPrivate; class Q_UML_EXPORT QUmlRedefinableElement : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlRedefinableElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlRedefinableElement(); // Owned attributes bool isLeaf() const; @@ -68,6 +67,11 @@ public: // Operations bool isConsistentWith(QUmlRedefinableElement *redefinee) const; bool isRedefinitionContextValid(QUmlRedefinableElement *redefined) const; + +protected: + bool _isLeaf; + QSet<QUmlRedefinableElement *> _redefinedElement; + QSet<QUmlClassifier *> _redefinitionContext; }; QT_END_NAMESPACE diff --git a/src/uml/qumlredefinableelement_p.h b/src/uml/qumlredefinableelement_p.h deleted file mode 100644 index 73e8063f..00000000 --- a/src/uml/qumlredefinableelement_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREDEFINABLEELEMENT_P_H -#define QUMLREDEFINABLEELEMENT_P_H - -#include "QtUml/QUmlRedefinableElement" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRedefinableElementPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlRedefinableElementPrivate(); - - bool isLeaf; - QSet<QUmlRedefinableElement *> redefinedElement; - QSet<QUmlClassifier *> redefinitionContext; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREDEFINABLEELEMENT_P_H - diff --git a/src/uml/qumlredefinabletemplatesignature.cpp b/src/uml/qumlredefinabletemplatesignature.cpp index 682a1cda..09927a75 100644 --- a/src/uml/qumlredefinabletemplatesignature.cpp +++ b/src/uml/qumlredefinabletemplatesignature.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumlredefinabletemplatesignature.h" -#include "qumlredefinabletemplatesignature_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlTemplateParameter> QT_BEGIN_NAMESPACE -QUmlRedefinableTemplateSignaturePrivate::QUmlRedefinableTemplateSignaturePrivate() : - classifier(0) -{ -} - /*! \class QUmlRedefinableTemplateSignature @@ -59,12 +53,9 @@ QUmlRedefinableTemplateSignaturePrivate::QUmlRedefinableTemplateSignaturePrivate \brief A redefinable template signature supports the addition of formal template parameters in a specialization of a template classifier. */ -QUmlRedefinableTemplateSignature::QUmlRedefinableTemplateSignature(bool create_d_ptr) : - QUmlTemplateSignature(false), - QUmlRedefinableElement(false) +QUmlRedefinableTemplateSignature::QUmlRedefinableTemplateSignature() : + _classifier(0) { - if (create_d_ptr) - set_d_ptr(new QUmlRedefinableTemplateSignaturePrivate); } // OWNED ATTRIBUTES @@ -76,17 +67,15 @@ QUmlClassifier *QUmlRedefinableTemplateSignature::classifier() const { // This is a read-write association end - QM_D(const QUmlRedefinableTemplateSignature); - return d->classifier; + return _classifier; } void QUmlRedefinableTemplateSignature::setClassifier(QUmlClassifier *classifier) { // This is a read-write association end - QM_D(QUmlRedefinableTemplateSignature); - if (d->classifier != classifier) { - d->classifier = classifier; + if (_classifier != classifier) { + _classifier = classifier; } } @@ -97,17 +86,15 @@ QSet<QUmlRedefinableTemplateSignature *> QUmlRedefinableTemplateSignature::exten { // This is a read-write association end - QM_D(const QUmlRedefinableTemplateSignature); - return d->extendedSignature; + return _extendedSignature; } void QUmlRedefinableTemplateSignature::addExtendedSignature(QUmlRedefinableTemplateSignature *extendedSignature) { // This is a read-write association end - QM_D(QUmlRedefinableTemplateSignature); - if (!d->extendedSignature.contains(extendedSignature)) { - d->extendedSignature.insert(extendedSignature); + if (!_extendedSignature.contains(extendedSignature)) { + _extendedSignature.insert(extendedSignature); } } @@ -115,9 +102,8 @@ void QUmlRedefinableTemplateSignature::removeExtendedSignature(QUmlRedefinableTe { // This is a read-write association end - QM_D(QUmlRedefinableTemplateSignature); - if (d->extendedSignature.contains(extendedSignature)) { - d->extendedSignature.remove(extendedSignature); + if (_extendedSignature.contains(extendedSignature)) { + _extendedSignature.remove(extendedSignature); } } diff --git a/src/uml/qumlredefinabletemplatesignature.h b/src/uml/qumlredefinabletemplatesignature.h index c14ae577..0f373839 100644 --- a/src/uml/qumlredefinabletemplatesignature.h +++ b/src/uml/qumlredefinabletemplatesignature.h @@ -55,11 +55,10 @@ QT_MODULE(QtUml) class QUmlClassifier; class QUmlTemplateParameter; -class QUmlRedefinableTemplateSignaturePrivate; class Q_UML_EXPORT QUmlRedefinableTemplateSignature : public QUmlTemplateSignature, public QUmlRedefinableElement { public: - QUmlRedefinableTemplateSignature(bool create_d_ptr = true); + QUmlRedefinableTemplateSignature(); // Owned attributes QUmlClassifier *classifier() const; @@ -71,6 +70,10 @@ public: // Operations bool isConsistentWith(QUmlRedefinableElement *redefinee) const; + +protected: + QUmlClassifier *_classifier; + QSet<QUmlRedefinableTemplateSignature *> _extendedSignature; }; QT_END_NAMESPACE diff --git a/src/uml/qumlredefinabletemplatesignature_p.h b/src/uml/qumlredefinabletemplatesignature_p.h deleted file mode 100644 index 7bf0523b..00000000 --- a/src/uml/qumlredefinabletemplatesignature_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREDEFINABLETEMPLATESIGNATURE_P_H -#define QUMLREDEFINABLETEMPLATESIGNATURE_P_H - -#include "QtUml/QUmlRedefinableTemplateSignature" - -#include "private/qumltemplatesignature_p.h" -#include "private/qumlredefinableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRedefinableTemplateSignaturePrivate : public QUmlTemplateSignaturePrivate, public QUmlRedefinableElementPrivate -{ -public: - QUmlRedefinableTemplateSignaturePrivate(); - - QUmlClassifier *classifier; - QSet<QUmlRedefinableTemplateSignature *> extendedSignature; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREDEFINABLETEMPLATESIGNATURE_P_H - diff --git a/src/uml/qumlreduceaction.cpp b/src/uml/qumlreduceaction.cpp index 6b11fdc0..987e053c 100644 --- a/src/uml/qumlreduceaction.cpp +++ b/src/uml/qumlreduceaction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlreduceaction.h" -#include "qumlreduceaction_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlInputPin> @@ -47,14 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlReduceActionPrivate::QUmlReduceActionPrivate() : - collection(0), - isOrdered(false), - reducer(0), - result(0) -{ -} - /*! \class QUmlReduceAction @@ -63,11 +54,12 @@ QUmlReduceActionPrivate::QUmlReduceActionPrivate() : \brief A reduce action is an action that reduces a collection to a single value by combining the elements of the collection. */ -QUmlReduceAction::QUmlReduceAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReduceAction::QUmlReduceAction() : + _collection(0), + _isOrdered(false), + _reducer(0), + _result(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReduceActionPrivate); } // OWNED ATTRIBUTES @@ -79,17 +71,15 @@ QUmlInputPin *QUmlReduceAction::collection() const { // This is a read-write association end - QM_D(const QUmlReduceAction); - return d->collection; + return _collection; } void QUmlReduceAction::setCollection(QUmlInputPin *collection) { // This is a read-write association end - QM_D(QUmlReduceAction); - if (d->collection != collection) { - d->collection = collection; + if (_collection != collection) { + _collection = collection; } } @@ -100,17 +90,15 @@ bool QUmlReduceAction::isOrdered() const { // This is a read-write property - QM_D(const QUmlReduceAction); - return d->isOrdered; + return _isOrdered; } void QUmlReduceAction::setOrdered(bool isOrdered) { // This is a read-write property - QM_D(QUmlReduceAction); - if (d->isOrdered != isOrdered) { - d->isOrdered = isOrdered; + if (_isOrdered != isOrdered) { + _isOrdered = isOrdered; } } @@ -121,17 +109,15 @@ QUmlBehavior *QUmlReduceAction::reducer() const { // This is a read-write association end - QM_D(const QUmlReduceAction); - return d->reducer; + return _reducer; } void QUmlReduceAction::setReducer(QUmlBehavior *reducer) { // This is a read-write association end - QM_D(QUmlReduceAction); - if (d->reducer != reducer) { - d->reducer = reducer; + if (_reducer != reducer) { + _reducer = reducer; } } @@ -142,17 +128,15 @@ QUmlOutputPin *QUmlReduceAction::result() const { // This is a read-write association end - QM_D(const QUmlReduceAction); - return d->result; + return _result; } void QUmlReduceAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlReduceAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } diff --git a/src/uml/qumlreduceaction.h b/src/uml/qumlreduceaction.h index f5331c84..6fd5c846 100644 --- a/src/uml/qumlreduceaction.h +++ b/src/uml/qumlreduceaction.h @@ -55,11 +55,10 @@ class QUmlBehavior; class QUmlInputPin; class QUmlOutputPin; -class QUmlReduceActionPrivate; class Q_UML_EXPORT QUmlReduceAction : public QUmlAction { public: - QUmlReduceAction(bool create_d_ptr = true); + QUmlReduceAction(); // Owned attributes QUmlInputPin *collection() const; @@ -70,6 +69,12 @@ public: void setReducer(QUmlBehavior *reducer); QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); + +protected: + QUmlInputPin *_collection; + bool _isOrdered; + QUmlBehavior *_reducer; + QUmlOutputPin *_result; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreduceaction_p.h b/src/uml/qumlreduceaction_p.h deleted file mode 100644 index 0096a87e..00000000 --- a/src/uml/qumlreduceaction_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREDUCEACTION_P_H -#define QUMLREDUCEACTION_P_H - -#include "QtUml/QUmlReduceAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReduceActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReduceActionPrivate(); - - QUmlInputPin *collection; - bool isOrdered; - QUmlBehavior *reducer; - QUmlOutputPin *result; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREDUCEACTION_P_H - diff --git a/src/uml/qumlregion.cpp b/src/uml/qumlregion.cpp index 02846c42..d981a09f 100644 --- a/src/uml/qumlregion.cpp +++ b/src/uml/qumlregion.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlregion.h" -#include "qumlregion_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlState> @@ -49,13 +48,6 @@ QT_BEGIN_NAMESPACE -QUmlRegionPrivate::QUmlRegionPrivate() : - extendedRegion(0), - state(0), - stateMachine(0) -{ -} - /*! \class QUmlRegion @@ -64,12 +56,11 @@ QUmlRegionPrivate::QUmlRegionPrivate() : \brief A region is an orthogonal part of either a composite state or a state machine. It contains states and transitions. */ -QUmlRegion::QUmlRegion(bool create_d_ptr) : - QUmlRedefinableElement(false), - QUmlNamespace(false) +QUmlRegion::QUmlRegion() : + _extendedRegion(0), + _state(0), + _stateMachine(0) { - if (create_d_ptr) - set_d_ptr(new QUmlRegionPrivate); } // OWNED ATTRIBUTES @@ -81,17 +72,15 @@ QUmlRegion *QUmlRegion::extendedRegion() const { // This is a read-write association end - QM_D(const QUmlRegion); - return d->extendedRegion; + return _extendedRegion; } void QUmlRegion::setExtendedRegion(QUmlRegion *extendedRegion) { // This is a read-write association end - QM_D(QUmlRegion); - if (d->extendedRegion != extendedRegion) { - d->extendedRegion = extendedRegion; + if (_extendedRegion != extendedRegion) { + _extendedRegion = extendedRegion; } } @@ -114,17 +103,15 @@ QUmlState *QUmlRegion::state() const { // This is a read-write association end - QM_D(const QUmlRegion); - return d->state; + return _state; } void QUmlRegion::setState(QUmlState *state) { // This is a read-write association end - QM_D(QUmlRegion); - if (d->state != state) { - d->state = state; + if (_state != state) { + _state = state; } } @@ -135,17 +122,15 @@ QUmlStateMachine *QUmlRegion::stateMachine() const { // This is a read-write association end - QM_D(const QUmlRegion); - return d->stateMachine; + return _stateMachine; } void QUmlRegion::setStateMachine(QUmlStateMachine *stateMachine) { // This is a read-write association end - QM_D(QUmlRegion); - if (d->stateMachine != stateMachine) { - d->stateMachine = stateMachine; + if (_stateMachine != stateMachine) { + _stateMachine = stateMachine; } } @@ -156,17 +141,15 @@ QSet<QUmlVertex *> QUmlRegion::subvertex() const { // This is a read-write association end - QM_D(const QUmlRegion); - return d->subvertex; + return _subvertex; } void QUmlRegion::addSubvertex(QUmlVertex *subvertex) { // This is a read-write association end - QM_D(QUmlRegion); - if (!d->subvertex.contains(subvertex)) { - d->subvertex.insert(subvertex); + if (!_subvertex.contains(subvertex)) { + _subvertex.insert(subvertex); } } @@ -174,9 +157,8 @@ void QUmlRegion::removeSubvertex(QUmlVertex *subvertex) { // This is a read-write association end - QM_D(QUmlRegion); - if (d->subvertex.contains(subvertex)) { - d->subvertex.remove(subvertex); + if (_subvertex.contains(subvertex)) { + _subvertex.remove(subvertex); } } @@ -187,17 +169,15 @@ QSet<QUmlTransition *> QUmlRegion::transition() const { // This is a read-write association end - QM_D(const QUmlRegion); - return d->transition; + return _transition; } void QUmlRegion::addTransition(QUmlTransition *transition) { // This is a read-write association end - QM_D(QUmlRegion); - if (!d->transition.contains(transition)) { - d->transition.insert(transition); + if (!_transition.contains(transition)) { + _transition.insert(transition); } } @@ -205,9 +185,8 @@ void QUmlRegion::removeTransition(QUmlTransition *transition) { // This is a read-write association end - QM_D(QUmlRegion); - if (d->transition.contains(transition)) { - d->transition.remove(transition); + if (_transition.contains(transition)) { + _transition.remove(transition); } } diff --git a/src/uml/qumlregion.h b/src/uml/qumlregion.h index 305bcbd3..5e698fc9 100644 --- a/src/uml/qumlregion.h +++ b/src/uml/qumlregion.h @@ -58,11 +58,10 @@ class QUmlStateMachine; class QUmlTransition; class QUmlVertex; -class QUmlRegionPrivate; class Q_UML_EXPORT QUmlRegion : public QUmlRedefinableElement, public QUmlNamespace { public: - QUmlRegion(bool create_d_ptr = true); + QUmlRegion(); // Owned attributes QUmlRegion *extendedRegion() const; @@ -84,6 +83,13 @@ public: QUmlStateMachine *containingStateMachine() const; bool isConsistentWith(QUmlRedefinableElement *redefinee) const; bool isRedefinitionContextValid(QUmlRegion *redefined) const; + +protected: + QUmlRegion *_extendedRegion; + QUmlState *_state; + QUmlStateMachine *_stateMachine; + QSet<QUmlVertex *> _subvertex; + QSet<QUmlTransition *> _transition; }; QT_END_NAMESPACE diff --git a/src/uml/qumlregion_p.h b/src/uml/qumlregion_p.h deleted file mode 100644 index e2bd161b..00000000 --- a/src/uml/qumlregion_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREGION_P_H -#define QUMLREGION_P_H - -#include "QtUml/QUmlRegion" - -#include "private/qumlredefinableelement_p.h" -#include "private/qumlnamespace_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRegionPrivate : public QUmlRedefinableElementPrivate, public QUmlNamespacePrivate -{ -public: - QUmlRegionPrivate(); - - QUmlRegion *extendedRegion; - QUmlState *state; - QUmlStateMachine *stateMachine; - QSet<QUmlVertex *> subvertex; - QSet<QUmlTransition *> transition; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREGION_P_H - diff --git a/src/uml/qumlrelationship.cpp b/src/uml/qumlrelationship.cpp index 6feb6442..c9cf0b7d 100644 --- a/src/uml/qumlrelationship.cpp +++ b/src/uml/qumlrelationship.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlrelationship.h" -#include "qumlrelationship_p.h" QT_BEGIN_NAMESPACE -QUmlRelationshipPrivate::QUmlRelationshipPrivate() -{ -} - /*! \class QUmlRelationship @@ -55,11 +50,8 @@ QUmlRelationshipPrivate::QUmlRelationshipPrivate() \brief Relationship is an abstract concept that specifies some kind of relationship between elements. */ -QUmlRelationship::QUmlRelationship(bool create_d_ptr) : - QUmlElement(false) +QUmlRelationship::QUmlRelationship() { - if (create_d_ptr) - set_d_ptr(new QUmlRelationshipPrivate); } // OWNED ATTRIBUTES @@ -71,8 +63,7 @@ QSet<QUmlElement *> QUmlRelationship::relatedElement() const { // This is a read-only derived union association end - QM_D(const QUmlRelationship); - return d->relatedElement; + return _relatedElement; } QT_END_NAMESPACE diff --git a/src/uml/qumlrelationship.h b/src/uml/qumlrelationship.h index d3e85735..43508566 100644 --- a/src/uml/qumlrelationship.h +++ b/src/uml/qumlrelationship.h @@ -51,14 +51,16 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlRelationshipPrivate; class Q_UML_EXPORT QUmlRelationship : public virtual QUmlElement { public: - Q_DECL_HIDDEN QUmlRelationship(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlRelationship(); // Owned attributes QSet<QUmlElement *> relatedElement() const; + +protected: + QSet<QUmlElement *> _relatedElement; }; QT_END_NAMESPACE diff --git a/src/uml/qumlrelationship_p.h b/src/uml/qumlrelationship_p.h deleted file mode 100644 index ce142377..00000000 --- a/src/uml/qumlrelationship_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLRELATIONSHIP_P_H -#define QUMLRELATIONSHIP_P_H - -#include "QtUml/QUmlRelationship" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRelationshipPrivate : public virtual QUmlElementPrivate -{ -public: - QUmlRelationshipPrivate(); - - QSet<QUmlElement *> relatedElement; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLRELATIONSHIP_P_H - diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.cpp b/src/uml/qumlremovestructuralfeaturevalueaction.cpp index 251321ea..7eaa87e4 100644 --- a/src/uml/qumlremovestructuralfeaturevalueaction.cpp +++ b/src/uml/qumlremovestructuralfeaturevalueaction.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlremovestructuralfeaturevalueaction.h" -#include "qumlremovestructuralfeaturevalueaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlRemoveStructuralFeatureValueActionPrivate::QUmlRemoveStructuralFeatureValueActionPrivate() : - isRemoveDuplicates(false), - removeAt(0) -{ -} - /*! \class QUmlRemoveStructuralFeatureValueAction @@ -59,11 +52,10 @@ QUmlRemoveStructuralFeatureValueActionPrivate::QUmlRemoveStructuralFeatureValueA \brief A remove structural feature value action is a write structural feature action that removes values from structural features. */ -QUmlRemoveStructuralFeatureValueAction::QUmlRemoveStructuralFeatureValueAction(bool create_d_ptr) : - QUmlWriteStructuralFeatureAction(false) +QUmlRemoveStructuralFeatureValueAction::QUmlRemoveStructuralFeatureValueAction() : + _isRemoveDuplicates(false), + _removeAt(0) { - if (create_d_ptr) - set_d_ptr(new QUmlRemoveStructuralFeatureValueActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ bool QUmlRemoveStructuralFeatureValueAction::isRemoveDuplicates() const { // This is a read-write property - QM_D(const QUmlRemoveStructuralFeatureValueAction); - return d->isRemoveDuplicates; + return _isRemoveDuplicates; } void QUmlRemoveStructuralFeatureValueAction::setRemoveDuplicates(bool isRemoveDuplicates) { // This is a read-write property - QM_D(QUmlRemoveStructuralFeatureValueAction); - if (d->isRemoveDuplicates != isRemoveDuplicates) { - d->isRemoveDuplicates = isRemoveDuplicates; + if (_isRemoveDuplicates != isRemoveDuplicates) { + _isRemoveDuplicates = isRemoveDuplicates; } } @@ -96,17 +86,15 @@ QUmlInputPin *QUmlRemoveStructuralFeatureValueAction::removeAt() const { // This is a read-write association end - QM_D(const QUmlRemoveStructuralFeatureValueAction); - return d->removeAt; + return _removeAt; } void QUmlRemoveStructuralFeatureValueAction::setRemoveAt(QUmlInputPin *removeAt) { // This is a read-write association end - QM_D(QUmlRemoveStructuralFeatureValueAction); - if (d->removeAt != removeAt) { - d->removeAt = removeAt; + if (_removeAt != removeAt) { + _removeAt = removeAt; } } diff --git a/src/uml/qumlremovestructuralfeaturevalueaction.h b/src/uml/qumlremovestructuralfeaturevalueaction.h index c08e9c70..13c2093d 100644 --- a/src/uml/qumlremovestructuralfeaturevalueaction.h +++ b/src/uml/qumlremovestructuralfeaturevalueaction.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlRemoveStructuralFeatureValueActionPrivate; class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueAction : public QUmlWriteStructuralFeatureAction { public: - QUmlRemoveStructuralFeatureValueAction(bool create_d_ptr = true); + QUmlRemoveStructuralFeatureValueAction(); // Owned attributes bool isRemoveDuplicates() const; void setRemoveDuplicates(bool isRemoveDuplicates); QUmlInputPin *removeAt() const; void setRemoveAt(QUmlInputPin *removeAt); + +protected: + bool _isRemoveDuplicates; + QUmlInputPin *_removeAt; }; QT_END_NAMESPACE diff --git a/src/uml/qumlremovestructuralfeaturevalueaction_p.h b/src/uml/qumlremovestructuralfeaturevalueaction_p.h deleted file mode 100644 index 5fcbd7ab..00000000 --- a/src/uml/qumlremovestructuralfeaturevalueaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREMOVESTRUCTURALFEATUREVALUEACTION_P_H -#define QUMLREMOVESTRUCTURALFEATUREVALUEACTION_P_H - -#include "QtUml/QUmlRemoveStructuralFeatureValueAction" - -#include "private/qumlwritestructuralfeatureaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRemoveStructuralFeatureValueActionPrivate : public QUmlWriteStructuralFeatureActionPrivate -{ -public: - QUmlRemoveStructuralFeatureValueActionPrivate(); - - bool isRemoveDuplicates; - QUmlInputPin *removeAt; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREMOVESTRUCTURALFEATUREVALUEACTION_P_H - diff --git a/src/uml/qumlremovevariablevalueaction.cpp b/src/uml/qumlremovevariablevalueaction.cpp index 81bcbef0..8fed666e 100644 --- a/src/uml/qumlremovevariablevalueaction.cpp +++ b/src/uml/qumlremovevariablevalueaction.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlremovevariablevalueaction.h" -#include "qumlremovevariablevalueaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlRemoveVariableValueActionPrivate::QUmlRemoveVariableValueActionPrivate() : - isRemoveDuplicates(false), - removeAt(0) -{ -} - /*! \class QUmlRemoveVariableValueAction @@ -59,11 +52,10 @@ QUmlRemoveVariableValueActionPrivate::QUmlRemoveVariableValueActionPrivate() : \brief A remove variable value action is a write variable action that removes values from variables. */ -QUmlRemoveVariableValueAction::QUmlRemoveVariableValueAction(bool create_d_ptr) : - QUmlWriteVariableAction(false) +QUmlRemoveVariableValueAction::QUmlRemoveVariableValueAction() : + _isRemoveDuplicates(false), + _removeAt(0) { - if (create_d_ptr) - set_d_ptr(new QUmlRemoveVariableValueActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ bool QUmlRemoveVariableValueAction::isRemoveDuplicates() const { // This is a read-write property - QM_D(const QUmlRemoveVariableValueAction); - return d->isRemoveDuplicates; + return _isRemoveDuplicates; } void QUmlRemoveVariableValueAction::setRemoveDuplicates(bool isRemoveDuplicates) { // This is a read-write property - QM_D(QUmlRemoveVariableValueAction); - if (d->isRemoveDuplicates != isRemoveDuplicates) { - d->isRemoveDuplicates = isRemoveDuplicates; + if (_isRemoveDuplicates != isRemoveDuplicates) { + _isRemoveDuplicates = isRemoveDuplicates; } } @@ -96,17 +86,15 @@ QUmlInputPin *QUmlRemoveVariableValueAction::removeAt() const { // This is a read-write association end - QM_D(const QUmlRemoveVariableValueAction); - return d->removeAt; + return _removeAt; } void QUmlRemoveVariableValueAction::setRemoveAt(QUmlInputPin *removeAt) { // This is a read-write association end - QM_D(QUmlRemoveVariableValueAction); - if (d->removeAt != removeAt) { - d->removeAt = removeAt; + if (_removeAt != removeAt) { + _removeAt = removeAt; } } diff --git a/src/uml/qumlremovevariablevalueaction.h b/src/uml/qumlremovevariablevalueaction.h index 6efc45c6..c26dcdc8 100644 --- a/src/uml/qumlremovevariablevalueaction.h +++ b/src/uml/qumlremovevariablevalueaction.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlRemoveVariableValueActionPrivate; class Q_UML_EXPORT QUmlRemoveVariableValueAction : public QUmlWriteVariableAction { public: - QUmlRemoveVariableValueAction(bool create_d_ptr = true); + QUmlRemoveVariableValueAction(); // Owned attributes bool isRemoveDuplicates() const; void setRemoveDuplicates(bool isRemoveDuplicates); QUmlInputPin *removeAt() const; void setRemoveAt(QUmlInputPin *removeAt); + +protected: + bool _isRemoveDuplicates; + QUmlInputPin *_removeAt; }; QT_END_NAMESPACE diff --git a/src/uml/qumlremovevariablevalueaction_p.h b/src/uml/qumlremovevariablevalueaction_p.h deleted file mode 100644 index 19cb934c..00000000 --- a/src/uml/qumlremovevariablevalueaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREMOVEVARIABLEVALUEACTION_P_H -#define QUMLREMOVEVARIABLEVALUEACTION_P_H - -#include "QtUml/QUmlRemoveVariableValueAction" - -#include "private/qumlwritevariableaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlRemoveVariableValueActionPrivate : public QUmlWriteVariableActionPrivate -{ -public: - QUmlRemoveVariableValueActionPrivate(); - - bool isRemoveDuplicates; - QUmlInputPin *removeAt; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREMOVEVARIABLEVALUEACTION_P_H - diff --git a/src/uml/qumlreplyaction.cpp b/src/uml/qumlreplyaction.cpp index d94e4b00..afb7fcf6 100644 --- a/src/uml/qumlreplyaction.cpp +++ b/src/uml/qumlreplyaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlreplyaction.h" -#include "qumlreplyaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlTrigger> QT_BEGIN_NAMESPACE -QUmlReplyActionPrivate::QUmlReplyActionPrivate() : - replyToCall(0), - returnInformation(0) -{ -} - /*! \class QUmlReplyAction @@ -60,11 +53,10 @@ QUmlReplyActionPrivate::QUmlReplyActionPrivate() : \brief A reply action is an action that accepts a set of return values and a value containing return information produced by a previous accept call action. The reply action returns the values to the caller of the previous call, completing execution of the call. */ -QUmlReplyAction::QUmlReplyAction(bool create_d_ptr) : - QUmlAction(false) +QUmlReplyAction::QUmlReplyAction() : + _replyToCall(0), + _returnInformation(0) { - if (create_d_ptr) - set_d_ptr(new QUmlReplyActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlTrigger *QUmlReplyAction::replyToCall() const { // This is a read-write association end - QM_D(const QUmlReplyAction); - return d->replyToCall; + return _replyToCall; } void QUmlReplyAction::setReplyToCall(QUmlTrigger *replyToCall) { // This is a read-write association end - QM_D(QUmlReplyAction); - if (d->replyToCall != replyToCall) { - d->replyToCall = replyToCall; + if (_replyToCall != replyToCall) { + _replyToCall = replyToCall; } } @@ -97,17 +87,15 @@ QSet<QUmlInputPin *> QUmlReplyAction::replyValue() const { // This is a read-write association end - QM_D(const QUmlReplyAction); - return d->replyValue; + return _replyValue; } void QUmlReplyAction::addReplyValue(QUmlInputPin *replyValue) { // This is a read-write association end - QM_D(QUmlReplyAction); - if (!d->replyValue.contains(replyValue)) { - d->replyValue.insert(replyValue); + if (!_replyValue.contains(replyValue)) { + _replyValue.insert(replyValue); } } @@ -115,9 +103,8 @@ void QUmlReplyAction::removeReplyValue(QUmlInputPin *replyValue) { // This is a read-write association end - QM_D(QUmlReplyAction); - if (d->replyValue.contains(replyValue)) { - d->replyValue.remove(replyValue); + if (_replyValue.contains(replyValue)) { + _replyValue.remove(replyValue); } } @@ -128,17 +115,15 @@ QUmlInputPin *QUmlReplyAction::returnInformation() const { // This is a read-write association end - QM_D(const QUmlReplyAction); - return d->returnInformation; + return _returnInformation; } void QUmlReplyAction::setReturnInformation(QUmlInputPin *returnInformation) { // This is a read-write association end - QM_D(QUmlReplyAction); - if (d->returnInformation != returnInformation) { - d->returnInformation = returnInformation; + if (_returnInformation != returnInformation) { + _returnInformation = returnInformation; } } diff --git a/src/uml/qumlreplyaction.h b/src/uml/qumlreplyaction.h index 74ad46d0..a423679a 100644 --- a/src/uml/qumlreplyaction.h +++ b/src/uml/qumlreplyaction.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlTrigger; -class QUmlReplyActionPrivate; class Q_UML_EXPORT QUmlReplyAction : public QUmlAction { public: - QUmlReplyAction(bool create_d_ptr = true); + QUmlReplyAction(); // Owned attributes QUmlTrigger *replyToCall() const; @@ -68,6 +67,11 @@ public: void removeReplyValue(QUmlInputPin *replyValue); QUmlInputPin *returnInformation() const; void setReturnInformation(QUmlInputPin *returnInformation); + +protected: + QUmlTrigger *_replyToCall; + QSet<QUmlInputPin *> _replyValue; + QUmlInputPin *_returnInformation; }; QT_END_NAMESPACE diff --git a/src/uml/qumlreplyaction_p.h b/src/uml/qumlreplyaction_p.h deleted file mode 100644 index e8a6ce9e..00000000 --- a/src/uml/qumlreplyaction_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLREPLYACTION_P_H -#define QUMLREPLYACTION_P_H - -#include "QtUml/QUmlReplyAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlReplyActionPrivate : public QUmlActionPrivate -{ -public: - QUmlReplyActionPrivate(); - - QUmlTrigger *replyToCall; - QSet<QUmlInputPin *> replyValue; - QUmlInputPin *returnInformation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLREPLYACTION_P_H - diff --git a/src/uml/qumlsendobjectaction.cpp b/src/uml/qumlsendobjectaction.cpp index fe7ad886..9ed62312 100644 --- a/src/uml/qumlsendobjectaction.cpp +++ b/src/uml/qumlsendobjectaction.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlsendobjectaction.h" -#include "qumlsendobjectaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlSendObjectActionPrivate::QUmlSendObjectActionPrivate() : - request(0), - target(0) -{ -} - /*! \class QUmlSendObjectAction @@ -59,11 +52,10 @@ QUmlSendObjectActionPrivate::QUmlSendObjectActionPrivate() : \brief A send object action is an action that transmits an object to the target object, where it may invoke behavior such as the firing of state machine transitions or the execution of an activity. The value of the object is available to the execution of invoked behaviors. The requestor continues execution immediately. Any reply message is ignored and is not transmitted to the requestor. */ -QUmlSendObjectAction::QUmlSendObjectAction(bool create_d_ptr) : - QUmlInvocationAction(false) +QUmlSendObjectAction::QUmlSendObjectAction() : + _request(0), + _target(0) { - if (create_d_ptr) - set_d_ptr(new QUmlSendObjectActionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlInputPin *QUmlSendObjectAction::request() const { // This is a read-write association end - QM_D(const QUmlSendObjectAction); - return d->request; + return _request; } void QUmlSendObjectAction::setRequest(QUmlInputPin *request) { // This is a read-write association end - QM_D(QUmlSendObjectAction); - if (d->request != request) { - d->request = request; + if (_request != request) { + _request = request; } } @@ -96,17 +86,15 @@ QUmlInputPin *QUmlSendObjectAction::target() const { // This is a read-write association end - QM_D(const QUmlSendObjectAction); - return d->target; + return _target; } void QUmlSendObjectAction::setTarget(QUmlInputPin *target) { // This is a read-write association end - QM_D(QUmlSendObjectAction); - if (d->target != target) { - d->target = target; + if (_target != target) { + _target = target; } } diff --git a/src/uml/qumlsendobjectaction.h b/src/uml/qumlsendobjectaction.h index 401574d2..021b3f10 100644 --- a/src/uml/qumlsendobjectaction.h +++ b/src/uml/qumlsendobjectaction.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlSendObjectActionPrivate; class Q_UML_EXPORT QUmlSendObjectAction : public QUmlInvocationAction { public: - QUmlSendObjectAction(bool create_d_ptr = true); + QUmlSendObjectAction(); // Owned attributes QUmlInputPin *request() const; void setRequest(QUmlInputPin *request); QUmlInputPin *target() const; void setTarget(QUmlInputPin *target); + +protected: + QUmlInputPin *_request; + QUmlInputPin *_target; }; QT_END_NAMESPACE diff --git a/src/uml/qumlsendobjectaction_p.h b/src/uml/qumlsendobjectaction_p.h deleted file mode 100644 index d404a5f9..00000000 --- a/src/uml/qumlsendobjectaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSENDOBJECTACTION_P_H -#define QUMLSENDOBJECTACTION_P_H - -#include "QtUml/QUmlSendObjectAction" - -#include "private/qumlinvocationaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlSendObjectActionPrivate : public QUmlInvocationActionPrivate -{ -public: - QUmlSendObjectActionPrivate(); - - QUmlInputPin *request; - QUmlInputPin *target; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSENDOBJECTACTION_P_H - diff --git a/src/uml/qumlsendsignalaction.cpp b/src/uml/qumlsendsignalaction.cpp index 18f83f03..876bb6f2 100644 --- a/src/uml/qumlsendsignalaction.cpp +++ b/src/uml/qumlsendsignalaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlsendsignalaction.h" -#include "qumlsendsignalaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlSignal> QT_BEGIN_NAMESPACE -QUmlSendSignalActionPrivate::QUmlSendSignalActionPrivate() : - signal(0), - target(0) -{ -} - /*! \class QUmlSendSignalAction @@ -60,11 +53,10 @@ QUmlSendSignalActionPrivate::QUmlSendSignalActionPrivate() : \brief A send signal action is an action that creates a signal instance from its inputs, and transmits it to the target object, where it may cause the firing of a state machine transition or the execution of an activity. The argument values are available to the execution of associated behaviors. The requestor continues execution immediately. Any reply message is ignored and is not transmitted to the requestor. If the input is already a signal instance, use a send object action. */ -QUmlSendSignalAction::QUmlSendSignalAction(bool create_d_ptr) : - QUmlInvocationAction(false) +QUmlSendSignalAction::QUmlSendSignalAction() : + _signal(0), + _target(0) { - if (create_d_ptr) - set_d_ptr(new QUmlSendSignalActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlSignal *QUmlSendSignalAction::signal() const { // This is a read-write association end - QM_D(const QUmlSendSignalAction); - return d->signal; + return _signal; } void QUmlSendSignalAction::setSignal(QUmlSignal *signal) { // This is a read-write association end - QM_D(QUmlSendSignalAction); - if (d->signal != signal) { - d->signal = signal; + if (_signal != signal) { + _signal = signal; } } @@ -97,17 +87,15 @@ QUmlInputPin *QUmlSendSignalAction::target() const { // This is a read-write association end - QM_D(const QUmlSendSignalAction); - return d->target; + return _target; } void QUmlSendSignalAction::setTarget(QUmlInputPin *target) { // This is a read-write association end - QM_D(QUmlSendSignalAction); - if (d->target != target) { - d->target = target; + if (_target != target) { + _target = target; } } diff --git a/src/uml/qumlsendsignalaction.h b/src/uml/qumlsendsignalaction.h index f34f9a78..2cd31f69 100644 --- a/src/uml/qumlsendsignalaction.h +++ b/src/uml/qumlsendsignalaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlSignal; -class QUmlSendSignalActionPrivate; class Q_UML_EXPORT QUmlSendSignalAction : public QUmlInvocationAction { public: - QUmlSendSignalAction(bool create_d_ptr = true); + QUmlSendSignalAction(); // Owned attributes QUmlSignal *signal() const; void setSignal(QUmlSignal *signal); QUmlInputPin *target() const; void setTarget(QUmlInputPin *target); + +protected: + QUmlSignal *_signal; + QUmlInputPin *_target; }; QT_END_NAMESPACE diff --git a/src/uml/qumlsendsignalaction_p.h b/src/uml/qumlsendsignalaction_p.h deleted file mode 100644 index 487c92d2..00000000 --- a/src/uml/qumlsendsignalaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSENDSIGNALACTION_P_H -#define QUMLSENDSIGNALACTION_P_H - -#include "QtUml/QUmlSendSignalAction" - -#include "private/qumlinvocationaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlSendSignalActionPrivate : public QUmlInvocationActionPrivate -{ -public: - QUmlSendSignalActionPrivate(); - - QUmlSignal *signal; - QUmlInputPin *target; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSENDSIGNALACTION_P_H - diff --git a/src/uml/qumlsequencenode.cpp b/src/uml/qumlsequencenode.cpp index a4e06640..86a09d06 100644 --- a/src/uml/qumlsequencenode.cpp +++ b/src/uml/qumlsequencenode.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlsequencenode.h" -#include "qumlsequencenode_p.h" #include <QtUml/QUmlExecutableNode> QT_BEGIN_NAMESPACE -QUmlSequenceNodePrivate::QUmlSequenceNodePrivate() -{ -} - /*! \class QUmlSequenceNode @@ -57,11 +52,8 @@ QUmlSequenceNodePrivate::QUmlSequenceNodePrivate() \brief A sequence node is a structured activity node that executes its actions in order. */ -QUmlSequenceNode::QUmlSequenceNode(bool create_d_ptr) : - QUmlStructuredActivityNode(false) +QUmlSequenceNode::QUmlSequenceNode() { - if (create_d_ptr) - set_d_ptr(new QUmlSequenceNodePrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QList<QUmlExecutableNode *> QUmlSequenceNode::executableNode() const { // This is a read-write association end - QM_D(const QUmlSequenceNode); - return d->executableNode; + return _executableNode; } void QUmlSequenceNode::addExecutableNode(QUmlExecutableNode *executableNode) { // This is a read-write association end - QM_D(QUmlSequenceNode); - if (!d->executableNode.contains(executableNode)) { - d->executableNode.append(executableNode); + if (!_executableNode.contains(executableNode)) { + _executableNode.append(executableNode); } } @@ -91,9 +81,8 @@ void QUmlSequenceNode::removeExecutableNode(QUmlExecutableNode *executableNode) { // This is a read-write association end - QM_D(QUmlSequenceNode); - if (d->executableNode.contains(executableNode)) { - d->executableNode.removeAll(executableNode); + if (_executableNode.contains(executableNode)) { + _executableNode.removeAll(executableNode); } } diff --git a/src/uml/qumlsequencenode.h b/src/uml/qumlsequencenode.h index 5d5e99af..f187043f 100644 --- a/src/uml/qumlsequencenode.h +++ b/src/uml/qumlsequencenode.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlExecutableNode; -class QUmlSequenceNodePrivate; class Q_UML_EXPORT QUmlSequenceNode : public QUmlStructuredActivityNode { public: - QUmlSequenceNode(bool create_d_ptr = true); + QUmlSequenceNode(); // Owned attributes QList<QUmlExecutableNode *> executableNode() const; void addExecutableNode(QUmlExecutableNode *executableNode); void removeExecutableNode(QUmlExecutableNode *executableNode); + +protected: + QList<QUmlExecutableNode *> _executableNode; }; QT_END_NAMESPACE diff --git a/src/uml/qumlsequencenode_p.h b/src/uml/qumlsequencenode_p.h deleted file mode 100644 index cf69b312..00000000 --- a/src/uml/qumlsequencenode_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSEQUENCENODE_P_H -#define QUMLSEQUENCENODE_P_H - -#include "QtUml/QUmlSequenceNode" - -#include "private/qumlstructuredactivitynode_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlSequenceNodePrivate : public QUmlStructuredActivityNodePrivate -{ -public: - QUmlSequenceNodePrivate(); - - QList<QUmlExecutableNode *> executableNode; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSEQUENCENODE_P_H - diff --git a/src/uml/qumlsignal.cpp b/src/uml/qumlsignal.cpp index c78503bb..94f9da9b 100644 --- a/src/uml/qumlsignal.cpp +++ b/src/uml/qumlsignal.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlsignal.h" -#include "qumlsignal_p.h" #include <QtUml/QUmlProperty> QT_BEGIN_NAMESPACE -QUmlSignalPrivate::QUmlSignalPrivate() -{ -} - /*! \class QUmlSignal @@ -57,11 +52,8 @@ QUmlSignalPrivate::QUmlSignalPrivate() \brief A signal is a specification of send request instances communicated between objects. The receiving object handles the received request instances as specified by its receptions. The data carried by a send request (which was passed to it by the send invocation occurrence that caused that request) are represented as attributes of the signal. A signal is defined independently of the classifiers handling the signal occurrence. */ -QUmlSignal::QUmlSignal(bool create_d_ptr) : - QUmlClassifier(false) +QUmlSignal::QUmlSignal() { - if (create_d_ptr) - set_d_ptr(new QUmlSignalPrivate); } // OWNED ATTRIBUTES @@ -73,17 +65,15 @@ QList<QUmlProperty *> QUmlSignal::ownedAttribute() const { // This is a read-write association end - QM_D(const QUmlSignal); - return d->ownedAttribute; + return _ownedAttribute; } void QUmlSignal::addOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlSignal); - if (!d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.append(ownedAttribute); + if (!_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.append(ownedAttribute); } } @@ -91,9 +81,8 @@ void QUmlSignal::removeOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlSignal); - if (d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.removeAll(ownedAttribute); + if (_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.removeAll(ownedAttribute); } } diff --git a/src/uml/qumlsignal.h b/src/uml/qumlsignal.h index 4d53890d..4476d710 100644 --- a/src/uml/qumlsignal.h +++ b/src/uml/qumlsignal.h @@ -53,16 +53,18 @@ QT_MODULE(QtUml) class QUmlProperty; -class QUmlSignalPrivate; class Q_UML_EXPORT QUmlSignal : public QUmlClassifier { public: - QUmlSignal(bool create_d_ptr = true); + QUmlSignal(); // Owned attributes QList<QUmlProperty *> ownedAttribute() const; void addOwnedAttribute(QUmlProperty *ownedAttribute); void removeOwnedAttribute(QUmlProperty *ownedAttribute); + +protected: + QList<QUmlProperty *> _ownedAttribute; }; QT_END_NAMESPACE diff --git a/src/uml/qumlsignal_p.h b/src/uml/qumlsignal_p.h deleted file mode 100644 index 14c51e71..00000000 --- a/src/uml/qumlsignal_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSIGNAL_P_H -#define QUMLSIGNAL_P_H - -#include "QtUml/QUmlSignal" - -#include "private/qumlclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlSignalPrivate : public QUmlClassifierPrivate -{ -public: - QUmlSignalPrivate(); - - QList<QUmlProperty *> ownedAttribute; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSIGNAL_P_H - diff --git a/src/uml/qumlsignalevent.cpp b/src/uml/qumlsignalevent.cpp index 9d2b4c36..6e5492c3 100644 --- a/src/uml/qumlsignalevent.cpp +++ b/src/uml/qumlsignalevent.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlsignalevent.h" -#include "qumlsignalevent_p.h" #include <QtUml/QUmlSignal> QT_BEGIN_NAMESPACE -QUmlSignalEventPrivate::QUmlSignalEventPrivate() : - signal(0) -{ -} - /*! \class QUmlSignalEvent @@ -58,11 +52,9 @@ QUmlSignalEventPrivate::QUmlSignalEventPrivate() : \brief A signal event represents the receipt of an asynchronous signal instance. A signal event may, for example, cause a state machine to trigger a transition. */ -QUmlSignalEvent::QUmlSignalEvent(bool create_d_ptr) : - QUmlMessageEvent(false) +QUmlSignalEvent::QUmlSignalEvent() : + _signal(0) { - if (create_d_ptr) - set_d_ptr(new QUmlSignalEventPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlSignal *QUmlSignalEvent::signal() const { // This is a read-write association end - QM_D(const QUmlSignalEvent); - return d->signal; + return _signal; } void QUmlSignalEvent::setSignal(QUmlSignal *signal) { // This is a read-write association end - QM_D(QUmlSignalEvent); - if (d->signal != signal) { - d->signal = signal; + if (_signal != signal) { + _signal = signal; } } diff --git a/src/uml/qumlsignalevent.h b/src/uml/qumlsignalevent.h index 0d9e234e..807a7165 100644 --- a/src/uml/qumlsignalevent.h +++ b/src/uml/qumlsignalevent.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlSignal; -class QUmlSignalEventPrivate; class Q_UML_EXPORT QUmlSignalEvent : public QUmlMessageEvent { public: - QUmlSignalEvent(bool create_d_ptr = true); + QUmlSignalEvent(); // Owned attributes QUmlSignal *signal() const; void setSignal(QUmlSignal *signal); + +protected: + QUmlSignal *_signal; }; QT_END_NAMESPACE diff --git a/src/uml/qumlsignalevent_p.h b/src/uml/qumlsignalevent_p.h deleted file mode 100644 index 33ccf2c1..00000000 --- a/src/uml/qumlsignalevent_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSIGNALEVENT_P_H -#define QUMLSIGNALEVENT_P_H - -#include "QtUml/QUmlSignalEvent" - -#include "private/qumlmessageevent_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlSignalEventPrivate : public QUmlMessageEventPrivate -{ -public: - QUmlSignalEventPrivate(); - - QUmlSignal *signal; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSIGNALEVENT_P_H - diff --git a/src/uml/qumlslot.cpp b/src/uml/qumlslot.cpp index bb8ccc1f..fbea74bd 100644 --- a/src/uml/qumlslot.cpp +++ b/src/uml/qumlslot.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlslot.h" -#include "qumlslot_p.h" #include <QtUml/QUmlInstanceSpecification> #include <QtUml/QUmlStructuralFeature> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlSlotPrivate::QUmlSlotPrivate() : - definingFeature(0), - owningInstance(0) -{ -} - /*! \class QUmlSlot @@ -61,11 +54,10 @@ QUmlSlotPrivate::QUmlSlotPrivate() : \brief A slot specifies that an entity modeled by an instance specification has a value or values for a specific structural feature. */ -QUmlSlot::QUmlSlot(bool create_d_ptr) : - QUmlElement(false) +QUmlSlot::QUmlSlot() : + _definingFeature(0), + _owningInstance(0) { - if (create_d_ptr) - set_d_ptr(new QUmlSlotPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlStructuralFeature *QUmlSlot::definingFeature() const { // This is a read-write association end - QM_D(const QUmlSlot); - return d->definingFeature; + return _definingFeature; } void QUmlSlot::setDefiningFeature(QUmlStructuralFeature *definingFeature) { // This is a read-write association end - QM_D(QUmlSlot); - if (d->definingFeature != definingFeature) { - d->definingFeature = definingFeature; + if (_definingFeature != definingFeature) { + _definingFeature = definingFeature; } } @@ -98,17 +88,15 @@ QUmlInstanceSpecification *QUmlSlot::owningInstance() const { // This is a read-write association end - QM_D(const QUmlSlot); - return d->owningInstance; + return _owningInstance; } void QUmlSlot::setOwningInstance(QUmlInstanceSpecification *owningInstance) { // This is a read-write association end - QM_D(QUmlSlot); - if (d->owningInstance != owningInstance) { - d->owningInstance = owningInstance; + if (_owningInstance != owningInstance) { + _owningInstance = owningInstance; } } @@ -119,17 +107,15 @@ QList<QUmlValueSpecification *> QUmlSlot::value() const { // This is a read-write association end - QM_D(const QUmlSlot); - return d->value; + return _value; } void QUmlSlot::addValue(QUmlValueSpecification *value) { // This is a read-write association end - QM_D(QUmlSlot); - if (!d->value.contains(value)) { - d->value.append(value); + if (!_value.contains(value)) { + _value.append(value); } } @@ -137,9 +123,8 @@ void QUmlSlot::removeValue(QUmlValueSpecification *value) { // This is a read-write association end - QM_D(QUmlSlot); - if (d->value.contains(value)) { - d->value.removeAll(value); + if (_value.contains(value)) { + _value.removeAll(value); } } diff --git a/src/uml/qumlslot.h b/src/uml/qumlslot.h index d494d0d2..27588bcc 100644 --- a/src/uml/qumlslot.h +++ b/src/uml/qumlslot.h @@ -55,11 +55,10 @@ class QUmlInstanceSpecification; class QUmlStructuralFeature; class QUmlValueSpecification; -class QUmlSlotPrivate; class Q_UML_EXPORT QUmlSlot : public QUmlElement { public: - QUmlSlot(bool create_d_ptr = true); + QUmlSlot(); // Owned attributes QUmlStructuralFeature *definingFeature() const; @@ -69,6 +68,11 @@ public: QList<QUmlValueSpecification *> value() const; void addValue(QUmlValueSpecification *value); void removeValue(QUmlValueSpecification *value); + +protected: + QUmlStructuralFeature *_definingFeature; + QUmlInstanceSpecification *_owningInstance; + QList<QUmlValueSpecification *> _value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlslot_p.h b/src/uml/qumlslot_p.h deleted file mode 100644 index 0b4f4e30..00000000 --- a/src/uml/qumlslot_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSLOT_P_H -#define QUMLSLOT_P_H - -#include "QtUml/QUmlSlot" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlSlotPrivate : public QUmlElementPrivate -{ -public: - QUmlSlotPrivate(); - - QUmlStructuralFeature *definingFeature; - QUmlInstanceSpecification *owningInstance; - QList<QUmlValueSpecification *> value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSLOT_P_H - diff --git a/src/uml/qumlstartclassifierbehavioraction.cpp b/src/uml/qumlstartclassifierbehavioraction.cpp index a0898ef5..8313c388 100644 --- a/src/uml/qumlstartclassifierbehavioraction.cpp +++ b/src/uml/qumlstartclassifierbehavioraction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlstartclassifierbehavioraction.h" -#include "qumlstartclassifierbehavioraction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlStartClassifierBehaviorActionPrivate::QUmlStartClassifierBehaviorActionPrivate() : - object(0) -{ -} - /*! \class QUmlStartClassifierBehaviorAction @@ -58,11 +52,9 @@ QUmlStartClassifierBehaviorActionPrivate::QUmlStartClassifierBehaviorActionPriva \brief A start classifier behavior action is an action that starts the classifier behavior of the input. */ -QUmlStartClassifierBehaviorAction::QUmlStartClassifierBehaviorAction(bool create_d_ptr) : - QUmlAction(false) +QUmlStartClassifierBehaviorAction::QUmlStartClassifierBehaviorAction() : + _object(0) { - if (create_d_ptr) - set_d_ptr(new QUmlStartClassifierBehaviorActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlInputPin *QUmlStartClassifierBehaviorAction::object() const { // This is a read-write association end - QM_D(const QUmlStartClassifierBehaviorAction); - return d->object; + return _object; } void QUmlStartClassifierBehaviorAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlStartClassifierBehaviorAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } diff --git a/src/uml/qumlstartclassifierbehavioraction.h b/src/uml/qumlstartclassifierbehavioraction.h index 8f946acf..96545eee 100644 --- a/src/uml/qumlstartclassifierbehavioraction.h +++ b/src/uml/qumlstartclassifierbehavioraction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlStartClassifierBehaviorActionPrivate; class Q_UML_EXPORT QUmlStartClassifierBehaviorAction : public QUmlAction { public: - QUmlStartClassifierBehaviorAction(bool create_d_ptr = true); + QUmlStartClassifierBehaviorAction(); // Owned attributes QUmlInputPin *object() const; void setObject(QUmlInputPin *object); + +protected: + QUmlInputPin *_object; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstartclassifierbehavioraction_p.h b/src/uml/qumlstartclassifierbehavioraction_p.h deleted file mode 100644 index d9697a21..00000000 --- a/src/uml/qumlstartclassifierbehavioraction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTARTCLASSIFIERBEHAVIORACTION_P_H -#define QUMLSTARTCLASSIFIERBEHAVIORACTION_P_H - -#include "QtUml/QUmlStartClassifierBehaviorAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStartClassifierBehaviorActionPrivate : public QUmlActionPrivate -{ -public: - QUmlStartClassifierBehaviorActionPrivate(); - - QUmlInputPin *object; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTARTCLASSIFIERBEHAVIORACTION_P_H - diff --git a/src/uml/qumlstartobjectbehavioraction.cpp b/src/uml/qumlstartobjectbehavioraction.cpp index 812cab04..70fbe47f 100644 --- a/src/uml/qumlstartobjectbehavioraction.cpp +++ b/src/uml/qumlstartobjectbehavioraction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlstartobjectbehavioraction.h" -#include "qumlstartobjectbehavioraction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlStartObjectBehaviorActionPrivate::QUmlStartObjectBehaviorActionPrivate() : - object(0) -{ -} - /*! \class QUmlStartObjectBehaviorAction @@ -58,11 +52,9 @@ QUmlStartObjectBehaviorActionPrivate::QUmlStartObjectBehaviorActionPrivate() : \brief StartObjectBehaviorAction is an action that starts the execution either of a directly instantiated behavior or of the classifier behavior of an object. Argument values may be supplied for the input parameters of the behavior. If the behavior is invoked synchronously, then output values may be obtained for output parameters. */ -QUmlStartObjectBehaviorAction::QUmlStartObjectBehaviorAction(bool create_d_ptr) : - QUmlCallAction(false) +QUmlStartObjectBehaviorAction::QUmlStartObjectBehaviorAction() : + _object(0) { - if (create_d_ptr) - set_d_ptr(new QUmlStartObjectBehaviorActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlInputPin *QUmlStartObjectBehaviorAction::object() const { // This is a read-write association end - QM_D(const QUmlStartObjectBehaviorAction); - return d->object; + return _object; } void QUmlStartObjectBehaviorAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlStartObjectBehaviorAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } diff --git a/src/uml/qumlstartobjectbehavioraction.h b/src/uml/qumlstartobjectbehavioraction.h index 3312da0e..135169e7 100644 --- a/src/uml/qumlstartobjectbehavioraction.h +++ b/src/uml/qumlstartobjectbehavioraction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlStartObjectBehaviorActionPrivate; class Q_UML_EXPORT QUmlStartObjectBehaviorAction : public QUmlCallAction { public: - QUmlStartObjectBehaviorAction(bool create_d_ptr = true); + QUmlStartObjectBehaviorAction(); // Owned attributes QUmlInputPin *object() const; void setObject(QUmlInputPin *object); + +protected: + QUmlInputPin *_object; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstartobjectbehavioraction_p.h b/src/uml/qumlstartobjectbehavioraction_p.h deleted file mode 100644 index 10a6f8a1..00000000 --- a/src/uml/qumlstartobjectbehavioraction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTARTOBJECTBEHAVIORACTION_P_H -#define QUMLSTARTOBJECTBEHAVIORACTION_P_H - -#include "QtUml/QUmlStartObjectBehaviorAction" - -#include "private/qumlcallaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStartObjectBehaviorActionPrivate : public QUmlCallActionPrivate -{ -public: - QUmlStartObjectBehaviorActionPrivate(); - - QUmlInputPin *object; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTARTOBJECTBEHAVIORACTION_P_H - diff --git a/src/uml/qumlstate.cpp b/src/uml/qumlstate.cpp index 7ebf53f8..2a137f87 100644 --- a/src/uml/qumlstate.cpp +++ b/src/uml/qumlstate.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlstate.h" -#include "qumlstate_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlClassifier> @@ -52,16 +51,6 @@ QT_BEGIN_NAMESPACE -QUmlStatePrivate::QUmlStatePrivate() : - doActivity(0), - entry(0), - exit(0), - redefinedState(0), - stateInvariant(0), - submachine(0) -{ -} - /*! \class QUmlState @@ -70,13 +59,14 @@ QUmlStatePrivate::QUmlStatePrivate() : \brief A state models a situation during which some (usually implicit) invariant condition holds.The states of protocol state machines are exposed to the users of their context classifiers. A protocol state represents an exposed stable situation of its context classifier: when an instance of the classifier is not processing any operation, users of this instance can always know its state configuration. */ -QUmlState::QUmlState(bool create_d_ptr) : - QUmlNamespace(false), - QUmlRedefinableElement(false), - QUmlVertex(false) +QUmlState::QUmlState() : + _doActivity(0), + _entry(0), + _exit(0), + _redefinedState(0), + _stateInvariant(0), + _submachine(0) { - if (create_d_ptr) - set_d_ptr(new QUmlStatePrivate); } // OWNED ATTRIBUTES @@ -88,17 +78,15 @@ QSet<QUmlConnectionPointReference *> QUmlState::connection() const { // This is a read-write association end - QM_D(const QUmlState); - return d->connection; + return _connection; } void QUmlState::addConnection(QUmlConnectionPointReference *connection) { // This is a read-write association end - QM_D(QUmlState); - if (!d->connection.contains(connection)) { - d->connection.insert(connection); + if (!_connection.contains(connection)) { + _connection.insert(connection); } } @@ -106,9 +94,8 @@ void QUmlState::removeConnection(QUmlConnectionPointReference *connection) { // This is a read-write association end - QM_D(QUmlState); - if (d->connection.contains(connection)) { - d->connection.remove(connection); + if (_connection.contains(connection)) { + _connection.remove(connection); } } @@ -119,17 +106,15 @@ QSet<QUmlPseudostate *> QUmlState::connectionPoint() const { // This is a read-write association end - QM_D(const QUmlState); - return d->connectionPoint; + return _connectionPoint; } void QUmlState::addConnectionPoint(QUmlPseudostate *connectionPoint) { // This is a read-write association end - QM_D(QUmlState); - if (!d->connectionPoint.contains(connectionPoint)) { - d->connectionPoint.insert(connectionPoint); + if (!_connectionPoint.contains(connectionPoint)) { + _connectionPoint.insert(connectionPoint); } } @@ -137,9 +122,8 @@ void QUmlState::removeConnectionPoint(QUmlPseudostate *connectionPoint) { // This is a read-write association end - QM_D(QUmlState); - if (d->connectionPoint.contains(connectionPoint)) { - d->connectionPoint.remove(connectionPoint); + if (_connectionPoint.contains(connectionPoint)) { + _connectionPoint.remove(connectionPoint); } } @@ -150,17 +134,15 @@ QSet<QUmlTrigger *> QUmlState::deferrableTrigger() const { // This is a read-write association end - QM_D(const QUmlState); - return d->deferrableTrigger; + return _deferrableTrigger; } void QUmlState::addDeferrableTrigger(QUmlTrigger *deferrableTrigger) { // This is a read-write association end - QM_D(QUmlState); - if (!d->deferrableTrigger.contains(deferrableTrigger)) { - d->deferrableTrigger.insert(deferrableTrigger); + if (!_deferrableTrigger.contains(deferrableTrigger)) { + _deferrableTrigger.insert(deferrableTrigger); } } @@ -168,9 +150,8 @@ void QUmlState::removeDeferrableTrigger(QUmlTrigger *deferrableTrigger) { // This is a read-write association end - QM_D(QUmlState); - if (d->deferrableTrigger.contains(deferrableTrigger)) { - d->deferrableTrigger.remove(deferrableTrigger); + if (_deferrableTrigger.contains(deferrableTrigger)) { + _deferrableTrigger.remove(deferrableTrigger); } } @@ -181,17 +162,15 @@ QUmlBehavior *QUmlState::doActivity() const { // This is a read-write association end - QM_D(const QUmlState); - return d->doActivity; + return _doActivity; } void QUmlState::setDoActivity(QUmlBehavior *doActivity) { // This is a read-write association end - QM_D(QUmlState); - if (d->doActivity != doActivity) { - d->doActivity = doActivity; + if (_doActivity != doActivity) { + _doActivity = doActivity; } } @@ -202,17 +181,15 @@ QUmlBehavior *QUmlState::entry() const { // This is a read-write association end - QM_D(const QUmlState); - return d->entry; + return _entry; } void QUmlState::setEntry(QUmlBehavior *entry) { // This is a read-write association end - QM_D(QUmlState); - if (d->entry != entry) { - d->entry = entry; + if (_entry != entry) { + _entry = entry; } } @@ -223,17 +200,15 @@ QUmlBehavior *QUmlState::exit() const { // This is a read-write association end - QM_D(const QUmlState); - return d->exit; + return _exit; } void QUmlState::setExit(QUmlBehavior *exit) { // This is a read-write association end - QM_D(QUmlState); - if (d->exit != exit) { - d->exit = exit; + if (_exit != exit) { + _exit = exit; } } @@ -292,17 +267,15 @@ QUmlState *QUmlState::redefinedState() const { // This is a read-write association end - QM_D(const QUmlState); - return d->redefinedState; + return _redefinedState; } void QUmlState::setRedefinedState(QUmlState *redefinedState) { // This is a read-write association end - QM_D(QUmlState); - if (d->redefinedState != redefinedState) { - d->redefinedState = redefinedState; + if (_redefinedState != redefinedState) { + _redefinedState = redefinedState; } } @@ -325,17 +298,15 @@ QSet<QUmlRegion *> QUmlState::region() const { // This is a read-write association end - QM_D(const QUmlState); - return d->region; + return _region; } void QUmlState::addRegion(QUmlRegion *region) { // This is a read-write association end - QM_D(QUmlState); - if (!d->region.contains(region)) { - d->region.insert(region); + if (!_region.contains(region)) { + _region.insert(region); } } @@ -343,9 +314,8 @@ void QUmlState::removeRegion(QUmlRegion *region) { // This is a read-write association end - QM_D(QUmlState); - if (d->region.contains(region)) { - d->region.remove(region); + if (_region.contains(region)) { + _region.remove(region); } } @@ -356,17 +326,15 @@ QUmlConstraint *QUmlState::stateInvariant() const { // This is a read-write association end - QM_D(const QUmlState); - return d->stateInvariant; + return _stateInvariant; } void QUmlState::setStateInvariant(QUmlConstraint *stateInvariant) { // This is a read-write association end - QM_D(QUmlState); - if (d->stateInvariant != stateInvariant) { - d->stateInvariant = stateInvariant; + if (_stateInvariant != stateInvariant) { + _stateInvariant = stateInvariant; } } @@ -377,17 +345,15 @@ QUmlStateMachine *QUmlState::submachine() const { // This is a read-write association end - QM_D(const QUmlState); - return d->submachine; + return _submachine; } void QUmlState::setSubmachine(QUmlStateMachine *submachine) { // This is a read-write association end - QM_D(QUmlState); - if (d->submachine != submachine) { - d->submachine = submachine; + if (_submachine != submachine) { + _submachine = submachine; } } diff --git a/src/uml/qumlstate.h b/src/uml/qumlstate.h index 02b9f0f5..c578d10b 100644 --- a/src/uml/qumlstate.h +++ b/src/uml/qumlstate.h @@ -62,11 +62,10 @@ class QUmlRegion; class QUmlStateMachine; class QUmlTrigger; -class QUmlStatePrivate; class Q_UML_EXPORT QUmlState : public QUmlNamespace, public QUmlRedefinableElement, public QUmlVertex { public: - QUmlState(bool create_d_ptr = true); + QUmlState(); // Owned attributes QSet<QUmlConnectionPointReference *> connection() const; @@ -103,6 +102,18 @@ public: QUmlStateMachine *containingStateMachine() const; bool isConsistentWith(QUmlRedefinableElement *redefinee) const; bool isRedefinitionContextValid(QUmlState *redefined) const; + +protected: + QSet<QUmlConnectionPointReference *> _connection; + QSet<QUmlPseudostate *> _connectionPoint; + QSet<QUmlTrigger *> _deferrableTrigger; + QUmlBehavior *_doActivity; + QUmlBehavior *_entry; + QUmlBehavior *_exit; + QUmlState *_redefinedState; + QSet<QUmlRegion *> _region; + QUmlConstraint *_stateInvariant; + QUmlStateMachine *_submachine; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstate_p.h b/src/uml/qumlstate_p.h deleted file mode 100644 index 84466f24..00000000 --- a/src/uml/qumlstate_p.h +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTATE_P_H -#define QUMLSTATE_P_H - -#include "QtUml/QUmlState" - -#include "private/qumlnamespace_p.h" -#include "private/qumlredefinableelement_p.h" -#include "private/qumlvertex_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStatePrivate : public QUmlNamespacePrivate, public QUmlRedefinableElementPrivate, public QUmlVertexPrivate -{ -public: - QUmlStatePrivate(); - - QSet<QUmlConnectionPointReference *> connection; - QSet<QUmlPseudostate *> connectionPoint; - QSet<QUmlTrigger *> deferrableTrigger; - QUmlBehavior *doActivity; - QUmlBehavior *entry; - QUmlBehavior *exit; - QUmlState *redefinedState; - QSet<QUmlRegion *> region; - QUmlConstraint *stateInvariant; - QUmlStateMachine *submachine; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTATE_P_H - diff --git a/src/uml/qumlstateinvariant.cpp b/src/uml/qumlstateinvariant.cpp index 8088633a..3f63a0c3 100644 --- a/src/uml/qumlstateinvariant.cpp +++ b/src/uml/qumlstateinvariant.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlstateinvariant.h" -#include "qumlstateinvariant_p.h" #include <QtUml/QUmlConstraint> #include <QtUml/QUmlLifeline> QT_BEGIN_NAMESPACE -QUmlStateInvariantPrivate::QUmlStateInvariantPrivate() : - covered(0), - invariant(0) -{ -} - /*! \class QUmlStateInvariant @@ -60,11 +53,10 @@ QUmlStateInvariantPrivate::QUmlStateInvariantPrivate() : \brief A state invariant is a runtime constraint on the participants of the interaction. It may be used to specify a variety of different kinds of constraints, such as values of attributes or variables, internal or external states, and so on. A state invariant is an interaction fragment and it is placed on a lifeline. */ -QUmlStateInvariant::QUmlStateInvariant(bool create_d_ptr) : - QUmlInteractionFragment(false) +QUmlStateInvariant::QUmlStateInvariant() : + _covered(0), + _invariant(0) { - if (create_d_ptr) - set_d_ptr(new QUmlStateInvariantPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlLifeline *QUmlStateInvariant::covered() const { // This is a read-write association end - QM_D(const QUmlStateInvariant); - return d->covered; + return _covered; } void QUmlStateInvariant::setCovered(QUmlLifeline *covered) { // This is a read-write association end - QM_D(QUmlStateInvariant); - if (d->covered != covered) { - d->covered = covered; + if (_covered != covered) { + _covered = covered; } } @@ -97,17 +87,15 @@ QUmlConstraint *QUmlStateInvariant::invariant() const { // This is a read-write association end - QM_D(const QUmlStateInvariant); - return d->invariant; + return _invariant; } void QUmlStateInvariant::setInvariant(QUmlConstraint *invariant) { // This is a read-write association end - QM_D(QUmlStateInvariant); - if (d->invariant != invariant) { - d->invariant = invariant; + if (_invariant != invariant) { + _invariant = invariant; } } diff --git a/src/uml/qumlstateinvariant.h b/src/uml/qumlstateinvariant.h index 003ed0ac..962dd916 100644 --- a/src/uml/qumlstateinvariant.h +++ b/src/uml/qumlstateinvariant.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlConstraint; class QUmlLifeline; -class QUmlStateInvariantPrivate; class Q_UML_EXPORT QUmlStateInvariant : public QUmlInteractionFragment { public: - QUmlStateInvariant(bool create_d_ptr = true); + QUmlStateInvariant(); // Owned attributes QUmlLifeline *covered() const; void setCovered(QUmlLifeline *covered); QUmlConstraint *invariant() const; void setInvariant(QUmlConstraint *invariant); + +protected: + QUmlLifeline *_covered; + QUmlConstraint *_invariant; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstateinvariant_p.h b/src/uml/qumlstateinvariant_p.h deleted file mode 100644 index 55a0c438..00000000 --- a/src/uml/qumlstateinvariant_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTATEINVARIANT_P_H -#define QUMLSTATEINVARIANT_P_H - -#include "QtUml/QUmlStateInvariant" - -#include "private/qumlinteractionfragment_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStateInvariantPrivate : public QUmlInteractionFragmentPrivate -{ -public: - QUmlStateInvariantPrivate(); - - QUmlLifeline *covered; - QUmlConstraint *invariant; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTATEINVARIANT_P_H - diff --git a/src/uml/qumlstatemachine.cpp b/src/uml/qumlstatemachine.cpp index d969402f..2bd5cbcc 100644 --- a/src/uml/qumlstatemachine.cpp +++ b/src/uml/qumlstatemachine.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlstatemachine.h" -#include "qumlstatemachine_p.h" #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPseudostate> @@ -49,10 +48,6 @@ QT_BEGIN_NAMESPACE -QUmlStateMachinePrivate::QUmlStateMachinePrivate() -{ -} - /*! \class QUmlStateMachine @@ -61,11 +56,8 @@ QUmlStateMachinePrivate::QUmlStateMachinePrivate() \brief State machines can be used to express the behavior of part of a system. Behavior is modeled as a traversal of a graph of state nodes interconnected by one or more joined transition arcs that are triggered by the dispatching of series of (event) occurrences. During this traversal, the state machine executes a series of activities associated with various elements of the state machine. */ -QUmlStateMachine::QUmlStateMachine(bool create_d_ptr) : - QUmlBehavior(false) +QUmlStateMachine::QUmlStateMachine() { - if (create_d_ptr) - set_d_ptr(new QUmlStateMachinePrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QSet<QUmlPseudostate *> QUmlStateMachine::connectionPoint() const { // This is a read-write association end - QM_D(const QUmlStateMachine); - return d->connectionPoint; + return _connectionPoint; } void QUmlStateMachine::addConnectionPoint(QUmlPseudostate *connectionPoint) { // This is a read-write association end - QM_D(QUmlStateMachine); - if (!d->connectionPoint.contains(connectionPoint)) { - d->connectionPoint.insert(connectionPoint); + if (!_connectionPoint.contains(connectionPoint)) { + _connectionPoint.insert(connectionPoint); } } @@ -95,9 +85,8 @@ void QUmlStateMachine::removeConnectionPoint(QUmlPseudostate *connectionPoint) { // This is a read-write association end - QM_D(QUmlStateMachine); - if (d->connectionPoint.contains(connectionPoint)) { - d->connectionPoint.remove(connectionPoint); + if (_connectionPoint.contains(connectionPoint)) { + _connectionPoint.remove(connectionPoint); } } @@ -108,17 +97,15 @@ QSet<QUmlStateMachine *> QUmlStateMachine::extendedStateMachine() const { // This is a read-write association end - QM_D(const QUmlStateMachine); - return d->extendedStateMachine; + return _extendedStateMachine; } void QUmlStateMachine::addExtendedStateMachine(QUmlStateMachine *extendedStateMachine) { // This is a read-write association end - QM_D(QUmlStateMachine); - if (!d->extendedStateMachine.contains(extendedStateMachine)) { - d->extendedStateMachine.insert(extendedStateMachine); + if (!_extendedStateMachine.contains(extendedStateMachine)) { + _extendedStateMachine.insert(extendedStateMachine); } } @@ -126,9 +113,8 @@ void QUmlStateMachine::removeExtendedStateMachine(QUmlStateMachine *extendedStat { // This is a read-write association end - QM_D(QUmlStateMachine); - if (d->extendedStateMachine.contains(extendedStateMachine)) { - d->extendedStateMachine.remove(extendedStateMachine); + if (_extendedStateMachine.contains(extendedStateMachine)) { + _extendedStateMachine.remove(extendedStateMachine); } } @@ -139,17 +125,15 @@ QSet<QUmlRegion *> QUmlStateMachine::region() const { // This is a read-write association end - QM_D(const QUmlStateMachine); - return d->region; + return _region; } void QUmlStateMachine::addRegion(QUmlRegion *region) { // This is a read-write association end - QM_D(QUmlStateMachine); - if (!d->region.contains(region)) { - d->region.insert(region); + if (!_region.contains(region)) { + _region.insert(region); } } @@ -157,9 +141,8 @@ void QUmlStateMachine::removeRegion(QUmlRegion *region) { // This is a read-write association end - QM_D(QUmlStateMachine); - if (d->region.contains(region)) { - d->region.remove(region); + if (_region.contains(region)) { + _region.remove(region); } } @@ -170,17 +153,15 @@ QSet<QUmlState *> QUmlStateMachine::submachineState() const { // This is a read-write association end - QM_D(const QUmlStateMachine); - return d->submachineState; + return _submachineState; } void QUmlStateMachine::addSubmachineState(QUmlState *submachineState) { // This is a read-write association end - QM_D(QUmlStateMachine); - if (!d->submachineState.contains(submachineState)) { - d->submachineState.insert(submachineState); + if (!_submachineState.contains(submachineState)) { + _submachineState.insert(submachineState); } } @@ -188,9 +169,8 @@ void QUmlStateMachine::removeSubmachineState(QUmlState *submachineState) { // This is a read-write association end - QM_D(QUmlStateMachine); - if (d->submachineState.contains(submachineState)) { - d->submachineState.remove(submachineState); + if (_submachineState.contains(submachineState)) { + _submachineState.remove(submachineState); } } diff --git a/src/uml/qumlstatemachine.h b/src/uml/qumlstatemachine.h index 41708b7b..ade23b21 100644 --- a/src/uml/qumlstatemachine.h +++ b/src/uml/qumlstatemachine.h @@ -57,11 +57,10 @@ class QUmlRedefinableElement; class QUmlRegion; class QUmlState; -class QUmlStateMachinePrivate; class Q_UML_EXPORT QUmlStateMachine : public QUmlBehavior { public: - QUmlStateMachine(bool create_d_ptr = true); + QUmlStateMachine(); // Owned attributes QSet<QUmlPseudostate *> connectionPoint() const; @@ -82,6 +81,12 @@ public: bool ancestor(QUmlState *s1, QUmlState *s2) const; bool isConsistentWith(QUmlRedefinableElement *redefinee) const; bool isRedefinitionContextValid(QUmlStateMachine *redefined) const; + +protected: + QSet<QUmlPseudostate *> _connectionPoint; + QSet<QUmlStateMachine *> _extendedStateMachine; + QSet<QUmlRegion *> _region; + QSet<QUmlState *> _submachineState; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstatemachine_p.h b/src/uml/qumlstatemachine_p.h deleted file mode 100644 index 63e43d81..00000000 --- a/src/uml/qumlstatemachine_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTATEMACHINE_P_H -#define QUMLSTATEMACHINE_P_H - -#include "QtUml/QUmlStateMachine" - -#include "private/qumlbehavior_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStateMachinePrivate : public QUmlBehaviorPrivate -{ -public: - QUmlStateMachinePrivate(); - - QSet<QUmlPseudostate *> connectionPoint; - QSet<QUmlStateMachine *> extendedStateMachine; - QSet<QUmlRegion *> region; - QSet<QUmlState *> submachineState; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTATEMACHINE_P_H - diff --git a/src/uml/qumlstereotype.cpp b/src/uml/qumlstereotype.cpp index 29cca4bb..654beef2 100644 --- a/src/uml/qumlstereotype.cpp +++ b/src/uml/qumlstereotype.cpp @@ -39,17 +39,12 @@ ** ****************************************************************************/ #include "qumlstereotype.h" -#include "qumlstereotype_p.h" #include <QtUml/QUmlImage> #include <QtUml/QUmlProfile> QT_BEGIN_NAMESPACE -QUmlStereotypePrivate::QUmlStereotypePrivate() -{ -} - /*! \class QUmlStereotype @@ -58,11 +53,8 @@ QUmlStereotypePrivate::QUmlStereotypePrivate() \brief A stereotype defines how an existing metaclass may be extended, and enables the use of platform or domain specific terminology or notation in place of, or in addition to, the ones used for the extended metaclass. */ -QUmlStereotype::QUmlStereotype(bool create_d_ptr) : - QUmlClass(false) +QUmlStereotype::QUmlStereotype() { - if (create_d_ptr) - set_d_ptr(new QUmlStereotypePrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QSet<QUmlImage *> QUmlStereotype::icon() const { // This is a read-write association end - QM_D(const QUmlStereotype); - return d->icon; + return _icon; } void QUmlStereotype::addIcon(QUmlImage *icon) { // This is a read-write association end - QM_D(QUmlStereotype); - if (!d->icon.contains(icon)) { - d->icon.insert(icon); + if (!_icon.contains(icon)) { + _icon.insert(icon); } } @@ -92,9 +82,8 @@ void QUmlStereotype::removeIcon(QUmlImage *icon) { // This is a read-write association end - QM_D(QUmlStereotype); - if (d->icon.contains(icon)) { - d->icon.remove(icon); + if (_icon.contains(icon)) { + _icon.remove(icon); } } diff --git a/src/uml/qumlstereotype.h b/src/uml/qumlstereotype.h index a1ce33bf..6899eb0c 100644 --- a/src/uml/qumlstereotype.h +++ b/src/uml/qumlstereotype.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlImage; class QUmlProfile; -class QUmlStereotypePrivate; class Q_UML_EXPORT QUmlStereotype : public QUmlClass { public: - QUmlStereotype(bool create_d_ptr = true); + QUmlStereotype(); // Owned attributes QSet<QUmlImage *> icon() const; @@ -68,6 +67,9 @@ public: // Operations QUmlProfile *containingProfile() const; + +protected: + QSet<QUmlImage *> _icon; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstereotype_p.h b/src/uml/qumlstereotype_p.h deleted file mode 100644 index ef86bdee..00000000 --- a/src/uml/qumlstereotype_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTEREOTYPE_P_H -#define QUMLSTEREOTYPE_P_H - -#include "QtUml/QUmlStereotype" - -#include "private/qumlclass_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStereotypePrivate : public QUmlClassPrivate -{ -public: - QUmlStereotypePrivate(); - - QSet<QUmlImage *> icon; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTEREOTYPE_P_H - diff --git a/src/uml/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp index 144e9d6a..d9438f94 100644 --- a/src/uml/qumlstringexpression.cpp +++ b/src/uml/qumlstringexpression.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlstringexpression.h" -#include "qumlstringexpression_p.h" QT_BEGIN_NAMESPACE -QUmlStringExpressionPrivate::QUmlStringExpressionPrivate() : - owningExpression(0) -{ -} - /*! \class QUmlStringExpression @@ -56,12 +50,9 @@ QUmlStringExpressionPrivate::QUmlStringExpressionPrivate() : \brief An expression that specifies a string value that is derived by concatenating a set of sub string expressions, some of which might be template parameters. */ -QUmlStringExpression::QUmlStringExpression(bool create_d_ptr) : - QUmlExpression(false), - QUmlTemplateableElement(false) +QUmlStringExpression::QUmlStringExpression() : + _owningExpression(0) { - if (create_d_ptr) - set_d_ptr(new QUmlStringExpressionPrivate); } // OWNED ATTRIBUTES @@ -73,17 +64,15 @@ QUmlStringExpression *QUmlStringExpression::owningExpression() const { // This is a read-write association end - QM_D(const QUmlStringExpression); - return d->owningExpression; + return _owningExpression; } void QUmlStringExpression::setOwningExpression(QUmlStringExpression *owningExpression) { // This is a read-write association end - QM_D(QUmlStringExpression); - if (d->owningExpression != owningExpression) { - d->owningExpression = owningExpression; + if (_owningExpression != owningExpression) { + _owningExpression = owningExpression; } } @@ -94,17 +83,15 @@ QSet<QUmlStringExpression *> QUmlStringExpression::subExpression() const { // This is a read-write association end - QM_D(const QUmlStringExpression); - return d->subExpression; + return _subExpression; } void QUmlStringExpression::addSubExpression(QUmlStringExpression *subExpression) { // This is a read-write association end - QM_D(QUmlStringExpression); - if (!d->subExpression.contains(subExpression)) { - d->subExpression.insert(subExpression); + if (!_subExpression.contains(subExpression)) { + _subExpression.insert(subExpression); } } @@ -112,9 +99,8 @@ void QUmlStringExpression::removeSubExpression(QUmlStringExpression *subExpressi { // This is a read-write association end - QM_D(QUmlStringExpression); - if (d->subExpression.contains(subExpression)) { - d->subExpression.remove(subExpression); + if (_subExpression.contains(subExpression)) { + _subExpression.remove(subExpression); } } diff --git a/src/uml/qumlstringexpression.h b/src/uml/qumlstringexpression.h index a403740d..7ee6b3ea 100644 --- a/src/uml/qumlstringexpression.h +++ b/src/uml/qumlstringexpression.h @@ -52,11 +52,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlStringExpressionPrivate; class Q_UML_EXPORT QUmlStringExpression : public QUmlExpression, public QUmlTemplateableElement { public: - QUmlStringExpression(bool create_d_ptr = true); + QUmlStringExpression(); // Owned attributes QUmlStringExpression *owningExpression() const; @@ -67,6 +66,10 @@ public: // Operations QString stringValue() const; + +protected: + QUmlStringExpression *_owningExpression; + QSet<QUmlStringExpression *> _subExpression; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstringexpression_p.h b/src/uml/qumlstringexpression_p.h deleted file mode 100644 index 8a2cd3cf..00000000 --- a/src/uml/qumlstringexpression_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTRINGEXPRESSION_P_H -#define QUMLSTRINGEXPRESSION_P_H - -#include "QtUml/QUmlStringExpression" - -#include "private/qumlexpression_p.h" -#include "private/qumltemplateableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStringExpressionPrivate : public QUmlExpressionPrivate, public QUmlTemplateableElementPrivate -{ -public: - QUmlStringExpressionPrivate(); - - QUmlStringExpression *owningExpression; - QSet<QUmlStringExpression *> subExpression; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTRINGEXPRESSION_P_H - diff --git a/src/uml/qumlstructuralfeature.cpp b/src/uml/qumlstructuralfeature.cpp index b874b4fb..55d9901f 100644 --- a/src/uml/qumlstructuralfeature.cpp +++ b/src/uml/qumlstructuralfeature.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumlstructuralfeature.h" -#include "qumlstructuralfeature_p.h" QT_BEGIN_NAMESPACE -QUmlStructuralFeaturePrivate::QUmlStructuralFeaturePrivate() : - isReadOnly(false) -{ -} - /*! \class QUmlStructuralFeature @@ -56,13 +50,9 @@ QUmlStructuralFeaturePrivate::QUmlStructuralFeaturePrivate() : \brief A structural feature is a typed feature of a classifier that specifies the structure of instances of the classifier.By specializing multiplicity element, it supports a multiplicity that specifies valid cardinalities for the collection of values associated with an instantiation of the structural feature. */ -QUmlStructuralFeature::QUmlStructuralFeature(bool create_d_ptr) : - QUmlTypedElement(false), - QUmlMultiplicityElement(false), - QUmlFeature(false) +QUmlStructuralFeature::QUmlStructuralFeature() : + _isReadOnly(false) { - if (create_d_ptr) - set_d_ptr(new QUmlStructuralFeaturePrivate); } // OWNED ATTRIBUTES @@ -74,17 +64,15 @@ bool QUmlStructuralFeature::isReadOnly() const { // This is a read-write property - QM_D(const QUmlStructuralFeature); - return d->isReadOnly; + return _isReadOnly; } void QUmlStructuralFeature::setReadOnly(bool isReadOnly) { // This is a read-write property - QM_D(QUmlStructuralFeature); - if (d->isReadOnly != isReadOnly) { - d->isReadOnly = isReadOnly; + if (_isReadOnly != isReadOnly) { + _isReadOnly = isReadOnly; } } diff --git a/src/uml/qumlstructuralfeature.h b/src/uml/qumlstructuralfeature.h index 7f33c741..f3a8cba9 100644 --- a/src/uml/qumlstructuralfeature.h +++ b/src/uml/qumlstructuralfeature.h @@ -53,15 +53,17 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlStructuralFeaturePrivate; class Q_UML_EXPORT QUmlStructuralFeature : public virtual QUmlTypedElement, public QUmlMultiplicityElement, public QUmlFeature { public: - Q_DECL_HIDDEN QUmlStructuralFeature(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlStructuralFeature(); // Owned attributes bool isReadOnly() const; void setReadOnly(bool isReadOnly); + +protected: + bool _isReadOnly; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstructuralfeature_p.h b/src/uml/qumlstructuralfeature_p.h deleted file mode 100644 index 1d9d1cfd..00000000 --- a/src/uml/qumlstructuralfeature_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTRUCTURALFEATURE_P_H -#define QUMLSTRUCTURALFEATURE_P_H - -#include "QtUml/QUmlStructuralFeature" - -#include "private/qumltypedelement_p.h" -#include "private/qumlmultiplicityelement_p.h" -#include "private/qumlfeature_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStructuralFeaturePrivate : public virtual QUmlTypedElementPrivate, public QUmlMultiplicityElementPrivate, public QUmlFeaturePrivate -{ -public: - QUmlStructuralFeaturePrivate(); - - bool isReadOnly; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTRUCTURALFEATURE_P_H - diff --git a/src/uml/qumlstructuralfeatureaction.cpp b/src/uml/qumlstructuralfeatureaction.cpp index 9cf0f023..5f22127a 100644 --- a/src/uml/qumlstructuralfeatureaction.cpp +++ b/src/uml/qumlstructuralfeatureaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlstructuralfeatureaction.h" -#include "qumlstructuralfeatureaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlStructuralFeature> QT_BEGIN_NAMESPACE -QUmlStructuralFeatureActionPrivate::QUmlStructuralFeatureActionPrivate() : - object(0), - structuralFeature(0) -{ -} - /*! \class QUmlStructuralFeatureAction @@ -60,11 +53,10 @@ QUmlStructuralFeatureActionPrivate::QUmlStructuralFeatureActionPrivate() : \brief StructuralFeatureAction is an abstract class for all structural feature actions. */ -QUmlStructuralFeatureAction::QUmlStructuralFeatureAction(bool create_d_ptr) : - QUmlAction(false) +QUmlStructuralFeatureAction::QUmlStructuralFeatureAction() : + _object(0), + _structuralFeature(0) { - if (create_d_ptr) - set_d_ptr(new QUmlStructuralFeatureActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlInputPin *QUmlStructuralFeatureAction::object() const { // This is a read-write association end - QM_D(const QUmlStructuralFeatureAction); - return d->object; + return _object; } void QUmlStructuralFeatureAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlStructuralFeatureAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } @@ -97,17 +87,15 @@ QUmlStructuralFeature *QUmlStructuralFeatureAction::structuralFeature() const { // This is a read-write association end - QM_D(const QUmlStructuralFeatureAction); - return d->structuralFeature; + return _structuralFeature; } void QUmlStructuralFeatureAction::setStructuralFeature(QUmlStructuralFeature *structuralFeature) { // This is a read-write association end - QM_D(QUmlStructuralFeatureAction); - if (d->structuralFeature != structuralFeature) { - d->structuralFeature = structuralFeature; + if (_structuralFeature != structuralFeature) { + _structuralFeature = structuralFeature; } } diff --git a/src/uml/qumlstructuralfeatureaction.h b/src/uml/qumlstructuralfeatureaction.h index 93aa5bad..ea663e92 100644 --- a/src/uml/qumlstructuralfeatureaction.h +++ b/src/uml/qumlstructuralfeatureaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlStructuralFeature; -class QUmlStructuralFeatureActionPrivate; class Q_UML_EXPORT QUmlStructuralFeatureAction : public QUmlAction { public: - Q_DECL_HIDDEN QUmlStructuralFeatureAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlStructuralFeatureAction(); // Owned attributes QUmlInputPin *object() const; void setObject(QUmlInputPin *object); QUmlStructuralFeature *structuralFeature() const; void setStructuralFeature(QUmlStructuralFeature *structuralFeature); + +protected: + QUmlInputPin *_object; + QUmlStructuralFeature *_structuralFeature; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstructuralfeatureaction_p.h b/src/uml/qumlstructuralfeatureaction_p.h deleted file mode 100644 index a322e75a..00000000 --- a/src/uml/qumlstructuralfeatureaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTRUCTURALFEATUREACTION_P_H -#define QUMLSTRUCTURALFEATUREACTION_P_H - -#include "QtUml/QUmlStructuralFeatureAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStructuralFeatureActionPrivate : public QUmlActionPrivate -{ -public: - QUmlStructuralFeatureActionPrivate(); - - QUmlInputPin *object; - QUmlStructuralFeature *structuralFeature; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTRUCTURALFEATUREACTION_P_H - diff --git a/src/uml/qumlstructuredactivitynode.cpp b/src/uml/qumlstructuredactivitynode.cpp index 5301ca2c..8c3e528a 100644 --- a/src/uml/qumlstructuredactivitynode.cpp +++ b/src/uml/qumlstructuredactivitynode.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlstructuredactivitynode.h" -#include "qumlstructuredactivitynode_p.h" #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityNode> @@ -49,12 +48,6 @@ QT_BEGIN_NAMESPACE -QUmlStructuredActivityNodePrivate::QUmlStructuredActivityNodePrivate() : - activity(0), - mustIsolate(false) -{ -} - /*! \class QUmlStructuredActivityNode @@ -63,13 +56,10 @@ QUmlStructuredActivityNodePrivate::QUmlStructuredActivityNodePrivate() : \brief A structured activity node is an executable activity node that may have an expansion into subordinate nodes as an activity group. The subordinate nodes must belong to only one structured activity node, although they may be nested.Because of the concurrent nature of the execution of actions within and across activities, it can be difficult to guarantee the consistent access and modification of object memory. In order to avoid race conditions or other concurrency-related problems, it is sometimes necessary to isolate the effects of a group of actions from the effects of actions outside the group. This may be indicated by setting the mustIsolate attribute to true on a structured activity node. If a structured activity node is "isolated," then any object used by an action within the node cannot be accessed by any action outside the node until the structured activity node as a whole completes. Any concurrent actions that would result in accessing such objects are required to have their execution deferred until the completion of the node. */ -QUmlStructuredActivityNode::QUmlStructuredActivityNode(bool create_d_ptr) : - QUmlAction(false), - QUmlNamespace(false), - QUmlActivityGroup(false) +QUmlStructuredActivityNode::QUmlStructuredActivityNode() : + _activity(0), + _mustIsolate(false) { - if (create_d_ptr) - set_d_ptr(new QUmlStructuredActivityNodePrivate); } // OWNED ATTRIBUTES @@ -81,17 +71,15 @@ QUmlActivity *QUmlStructuredActivityNode::activity() const { // This is a read-write association end - QM_D(const QUmlStructuredActivityNode); - return d->activity; + return _activity; } void QUmlStructuredActivityNode::setActivity(QUmlActivity *activity) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (d->activity != activity) { - d->activity = activity; + if (_activity != activity) { + _activity = activity; } } @@ -102,17 +90,15 @@ QSet<QUmlActivityEdge *> QUmlStructuredActivityNode::edge() const { // This is a read-write association end - QM_D(const QUmlStructuredActivityNode); - return d->edge; + return _edge; } void QUmlStructuredActivityNode::addEdge(QUmlActivityEdge *edge) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (!d->edge.contains(edge)) { - d->edge.insert(edge); + if (!_edge.contains(edge)) { + _edge.insert(edge); } } @@ -120,9 +106,8 @@ void QUmlStructuredActivityNode::removeEdge(QUmlActivityEdge *edge) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (d->edge.contains(edge)) { - d->edge.remove(edge); + if (_edge.contains(edge)) { + _edge.remove(edge); } } @@ -133,17 +118,15 @@ bool QUmlStructuredActivityNode::mustIsolate() const { // This is a read-write property - QM_D(const QUmlStructuredActivityNode); - return d->mustIsolate; + return _mustIsolate; } void QUmlStructuredActivityNode::setMustIsolate(bool mustIsolate) { // This is a read-write property - QM_D(QUmlStructuredActivityNode); - if (d->mustIsolate != mustIsolate) { - d->mustIsolate = mustIsolate; + if (_mustIsolate != mustIsolate) { + _mustIsolate = mustIsolate; } } @@ -154,17 +137,15 @@ QSet<QUmlActivityNode *> QUmlStructuredActivityNode::node() const { // This is a read-write association end - QM_D(const QUmlStructuredActivityNode); - return d->node; + return _node; } void QUmlStructuredActivityNode::addNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (!d->node.contains(node)) { - d->node.insert(node); + if (!_node.contains(node)) { + _node.insert(node); } } @@ -172,9 +153,8 @@ void QUmlStructuredActivityNode::removeNode(QUmlActivityNode *node) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (d->node.contains(node)) { - d->node.remove(node); + if (_node.contains(node)) { + _node.remove(node); } } @@ -182,17 +162,15 @@ QSet<QUmlInputPin *> QUmlStructuredActivityNode::structuredNodeInput() const { // This is a read-write association end - QM_D(const QUmlStructuredActivityNode); - return d->structuredNodeInput; + return _structuredNodeInput; } void QUmlStructuredActivityNode::addStructuredNodeInput(QUmlInputPin *structuredNodeInput) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (!d->structuredNodeInput.contains(structuredNodeInput)) { - d->structuredNodeInput.insert(structuredNodeInput); + if (!_structuredNodeInput.contains(structuredNodeInput)) { + _structuredNodeInput.insert(structuredNodeInput); } } @@ -200,9 +178,8 @@ void QUmlStructuredActivityNode::removeStructuredNodeInput(QUmlInputPin *structu { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (d->structuredNodeInput.contains(structuredNodeInput)) { - d->structuredNodeInput.remove(structuredNodeInput); + if (_structuredNodeInput.contains(structuredNodeInput)) { + _structuredNodeInput.remove(structuredNodeInput); } } @@ -210,17 +187,15 @@ QSet<QUmlOutputPin *> QUmlStructuredActivityNode::structuredNodeOutput() const { // This is a read-write association end - QM_D(const QUmlStructuredActivityNode); - return d->structuredNodeOutput; + return _structuredNodeOutput; } void QUmlStructuredActivityNode::addStructuredNodeOutput(QUmlOutputPin *structuredNodeOutput) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (!d->structuredNodeOutput.contains(structuredNodeOutput)) { - d->structuredNodeOutput.insert(structuredNodeOutput); + if (!_structuredNodeOutput.contains(structuredNodeOutput)) { + _structuredNodeOutput.insert(structuredNodeOutput); } } @@ -228,9 +203,8 @@ void QUmlStructuredActivityNode::removeStructuredNodeOutput(QUmlOutputPin *struc { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (d->structuredNodeOutput.contains(structuredNodeOutput)) { - d->structuredNodeOutput.remove(structuredNodeOutput); + if (_structuredNodeOutput.contains(structuredNodeOutput)) { + _structuredNodeOutput.remove(structuredNodeOutput); } } @@ -241,17 +215,15 @@ QSet<QUmlVariable *> QUmlStructuredActivityNode::variable() const { // This is a read-write association end - QM_D(const QUmlStructuredActivityNode); - return d->variable; + return _variable; } void QUmlStructuredActivityNode::addVariable(QUmlVariable *variable) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (!d->variable.contains(variable)) { - d->variable.insert(variable); + if (!_variable.contains(variable)) { + _variable.insert(variable); } } @@ -259,9 +231,8 @@ void QUmlStructuredActivityNode::removeVariable(QUmlVariable *variable) { // This is a read-write association end - QM_D(QUmlStructuredActivityNode); - if (d->variable.contains(variable)) { - d->variable.remove(variable); + if (_variable.contains(variable)) { + _variable.remove(variable); } } diff --git a/src/uml/qumlstructuredactivitynode.h b/src/uml/qumlstructuredactivitynode.h index bcecf6ab..1059865f 100644 --- a/src/uml/qumlstructuredactivitynode.h +++ b/src/uml/qumlstructuredactivitynode.h @@ -59,11 +59,10 @@ class QUmlInputPin; class QUmlOutputPin; class QUmlVariable; -class QUmlStructuredActivityNodePrivate; class Q_UML_EXPORT QUmlStructuredActivityNode : public QUmlAction, public QUmlNamespace, public QUmlActivityGroup { public: - QUmlStructuredActivityNode(bool create_d_ptr = true); + QUmlStructuredActivityNode(); // Owned attributes QUmlActivity *activity() const; @@ -85,6 +84,15 @@ public: QSet<QUmlVariable *> variable() const; void addVariable(QUmlVariable *variable); void removeVariable(QUmlVariable *variable); + +protected: + QUmlActivity *_activity; + QSet<QUmlActivityEdge *> _edge; + bool _mustIsolate; + QSet<QUmlActivityNode *> _node; + QSet<QUmlInputPin *> _structuredNodeInput; + QSet<QUmlOutputPin *> _structuredNodeOutput; + QSet<QUmlVariable *> _variable; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstructuredactivitynode_p.h b/src/uml/qumlstructuredactivitynode_p.h deleted file mode 100644 index 2e058d36..00000000 --- a/src/uml/qumlstructuredactivitynode_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTRUCTUREDACTIVITYNODE_P_H -#define QUMLSTRUCTUREDACTIVITYNODE_P_H - -#include "QtUml/QUmlStructuredActivityNode" - -#include "private/qumlaction_p.h" -#include "private/qumlnamespace_p.h" -#include "private/qumlactivitygroup_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStructuredActivityNodePrivate : public QUmlActionPrivate, public QUmlNamespacePrivate, public QUmlActivityGroupPrivate -{ -public: - QUmlStructuredActivityNodePrivate(); - - QUmlActivity *activity; - QSet<QUmlActivityEdge *> edge; - bool mustIsolate; - QSet<QUmlActivityNode *> node; - QSet<QUmlInputPin *> structuredNodeInput; - QSet<QUmlOutputPin *> structuredNodeOutput; - QSet<QUmlVariable *> variable; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTRUCTUREDACTIVITYNODE_P_H - diff --git a/src/uml/qumlstructuredclassifier.cpp b/src/uml/qumlstructuredclassifier.cpp index 45a948ab..817f2fbf 100644 --- a/src/uml/qumlstructuredclassifier.cpp +++ b/src/uml/qumlstructuredclassifier.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlstructuredclassifier.h" -#include "qumlstructuredclassifier_p.h" #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlConnector> @@ -47,10 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlStructuredClassifierPrivate::QUmlStructuredClassifierPrivate() -{ -} - /*! \class QUmlStructuredClassifier @@ -59,11 +54,8 @@ QUmlStructuredClassifierPrivate::QUmlStructuredClassifierPrivate() \brief A structured classifier is an abstract metaclass that represents any classifier whose behavior can be fully or partly described by the collaboration of owned or referenced instances. */ -QUmlStructuredClassifier::QUmlStructuredClassifier(bool create_d_ptr) : - QUmlClassifier(false) +QUmlStructuredClassifier::QUmlStructuredClassifier() { - if (create_d_ptr) - set_d_ptr(new QUmlStructuredClassifierPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QList<QUmlProperty *> QUmlStructuredClassifier::ownedAttribute() const { // This is a read-write association end - QM_D(const QUmlStructuredClassifier); - return d->ownedAttribute; + return _ownedAttribute; } void QUmlStructuredClassifier::addOwnedAttribute(QUmlProperty *ownedAttribute) { // This is a read-write association end - QM_D(QUmlStructuredClassifier); - if (!d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.append(ownedAttribute); + if (!_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.append(ownedAttribute); } } @@ -93,9 +83,8 @@ void QUmlStructuredClassifier::removeOwnedAttribute(QUmlProperty *ownedAttribute { // This is a read-write association end - QM_D(QUmlStructuredClassifier); - if (d->ownedAttribute.contains(ownedAttribute)) { - d->ownedAttribute.removeAll(ownedAttribute); + if (_ownedAttribute.contains(ownedAttribute)) { + _ownedAttribute.removeAll(ownedAttribute); } } @@ -106,17 +95,15 @@ QSet<QUmlConnector *> QUmlStructuredClassifier::ownedConnector() const { // This is a read-write association end - QM_D(const QUmlStructuredClassifier); - return d->ownedConnector; + return _ownedConnector; } void QUmlStructuredClassifier::addOwnedConnector(QUmlConnector *ownedConnector) { // This is a read-write association end - QM_D(QUmlStructuredClassifier); - if (!d->ownedConnector.contains(ownedConnector)) { - d->ownedConnector.insert(ownedConnector); + if (!_ownedConnector.contains(ownedConnector)) { + _ownedConnector.insert(ownedConnector); } } @@ -124,9 +111,8 @@ void QUmlStructuredClassifier::removeOwnedConnector(QUmlConnector *ownedConnecto { // This is a read-write association end - QM_D(QUmlStructuredClassifier); - if (d->ownedConnector.contains(ownedConnector)) { - d->ownedConnector.remove(ownedConnector); + if (_ownedConnector.contains(ownedConnector)) { + _ownedConnector.remove(ownedConnector); } } @@ -149,8 +135,7 @@ QSet<QUmlConnectableElement *> QUmlStructuredClassifier::role() const { // This is a read-only derived union association end - QM_D(const QUmlStructuredClassifier); - return d->role; + return _role; } QT_END_NAMESPACE diff --git a/src/uml/qumlstructuredclassifier.h b/src/uml/qumlstructuredclassifier.h index 9a99a78c..83fd8db2 100644 --- a/src/uml/qumlstructuredclassifier.h +++ b/src/uml/qumlstructuredclassifier.h @@ -55,11 +55,10 @@ class QUmlConnectableElement; class QUmlConnector; class QUmlProperty; -class QUmlStructuredClassifierPrivate; class Q_UML_EXPORT QUmlStructuredClassifier : public QUmlClassifier { public: - Q_DECL_HIDDEN QUmlStructuredClassifier(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlStructuredClassifier(); // Owned attributes QList<QUmlProperty *> ownedAttribute() const; @@ -70,6 +69,11 @@ public: void removeOwnedConnector(QUmlConnector *ownedConnector); QSet<QUmlProperty *> part() const; QSet<QUmlConnectableElement *> role() const; + +protected: + QList<QUmlProperty *> _ownedAttribute; + QSet<QUmlConnector *> _ownedConnector; + QSet<QUmlConnectableElement *> _role; }; QT_END_NAMESPACE diff --git a/src/uml/qumlstructuredclassifier_p.h b/src/uml/qumlstructuredclassifier_p.h deleted file mode 100644 index 5fa21771..00000000 --- a/src/uml/qumlstructuredclassifier_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSTRUCTUREDCLASSIFIER_P_H -#define QUMLSTRUCTUREDCLASSIFIER_P_H - -#include "QtUml/QUmlStructuredClassifier" - -#include "private/qumlclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlStructuredClassifierPrivate : public QUmlClassifierPrivate -{ -public: - QUmlStructuredClassifierPrivate(); - - QList<QUmlProperty *> ownedAttribute; - QSet<QUmlConnector *> ownedConnector; - QSet<QUmlConnectableElement *> role; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSTRUCTUREDCLASSIFIER_P_H - diff --git a/src/uml/qumlsubstitution.cpp b/src/uml/qumlsubstitution.cpp index 0efcb15b..604855cd 100644 --- a/src/uml/qumlsubstitution.cpp +++ b/src/uml/qumlsubstitution.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumlsubstitution.h" -#include "qumlsubstitution_p.h" #include <QtUml/QUmlClassifier> QT_BEGIN_NAMESPACE -QUmlSubstitutionPrivate::QUmlSubstitutionPrivate() : - contract(0), - substitutingClassifier(0) -{ -} - /*! \class QUmlSubstitution @@ -59,11 +52,10 @@ QUmlSubstitutionPrivate::QUmlSubstitutionPrivate() : \brief A substitution is a relationship between two classifiers signifies that the substituting classifier complies with the contract specified by the contract classifier. This implies that instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected. */ -QUmlSubstitution::QUmlSubstitution(bool create_d_ptr) : - QUmlRealization(false) +QUmlSubstitution::QUmlSubstitution() : + _contract(0), + _substitutingClassifier(0) { - if (create_d_ptr) - set_d_ptr(new QUmlSubstitutionPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlClassifier *QUmlSubstitution::contract() const { // This is a read-write association end - QM_D(const QUmlSubstitution); - return d->contract; + return _contract; } void QUmlSubstitution::setContract(QUmlClassifier *contract) { // This is a read-write association end - QM_D(QUmlSubstitution); - if (d->contract != contract) { - d->contract = contract; + if (_contract != contract) { + _contract = contract; } } @@ -96,17 +86,15 @@ QUmlClassifier *QUmlSubstitution::substitutingClassifier() const { // This is a read-write association end - QM_D(const QUmlSubstitution); - return d->substitutingClassifier; + return _substitutingClassifier; } void QUmlSubstitution::setSubstitutingClassifier(QUmlClassifier *substitutingClassifier) { // This is a read-write association end - QM_D(QUmlSubstitution); - if (d->substitutingClassifier != substitutingClassifier) { - d->substitutingClassifier = substitutingClassifier; + if (_substitutingClassifier != substitutingClassifier) { + _substitutingClassifier = substitutingClassifier; } } diff --git a/src/uml/qumlsubstitution.h b/src/uml/qumlsubstitution.h index 3ec80f0d..bcc4c89c 100644 --- a/src/uml/qumlsubstitution.h +++ b/src/uml/qumlsubstitution.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlClassifier; -class QUmlSubstitutionPrivate; class Q_UML_EXPORT QUmlSubstitution : public QUmlRealization { public: - QUmlSubstitution(bool create_d_ptr = true); + QUmlSubstitution(); // Owned attributes QUmlClassifier *contract() const; void setContract(QUmlClassifier *contract); QUmlClassifier *substitutingClassifier() const; void setSubstitutingClassifier(QUmlClassifier *substitutingClassifier); + +protected: + QUmlClassifier *_contract; + QUmlClassifier *_substitutingClassifier; }; QT_END_NAMESPACE diff --git a/src/uml/qumlsubstitution_p.h b/src/uml/qumlsubstitution_p.h deleted file mode 100644 index aaa6ab6d..00000000 --- a/src/uml/qumlsubstitution_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLSUBSTITUTION_P_H -#define QUMLSUBSTITUTION_P_H - -#include "QtUml/QUmlSubstitution" - -#include "private/qumlrealization_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlSubstitutionPrivate : public QUmlRealizationPrivate -{ -public: - QUmlSubstitutionPrivate(); - - QUmlClassifier *contract; - QUmlClassifier *substitutingClassifier; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLSUBSTITUTION_P_H - diff --git a/src/uml/qumltemplateableelement.cpp b/src/uml/qumltemplateableelement.cpp index 4e8e7292..b1e563f3 100644 --- a/src/uml/qumltemplateableelement.cpp +++ b/src/uml/qumltemplateableelement.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumltemplateableelement.h" -#include "qumltemplateableelement_p.h" #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateBinding> @@ -47,11 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlTemplateableElementPrivate::QUmlTemplateableElementPrivate() : - ownedTemplateSignature(0) -{ -} - /*! \class QUmlTemplateableElement @@ -60,11 +54,9 @@ QUmlTemplateableElementPrivate::QUmlTemplateableElementPrivate() : \brief A templateable element is an element that can optionally be defined as a template and bound to other templates. */ -QUmlTemplateableElement::QUmlTemplateableElement(bool create_d_ptr) : - QUmlElement(false) +QUmlTemplateableElement::QUmlTemplateableElement() : + _ownedTemplateSignature(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTemplateableElementPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlTemplateSignature *QUmlTemplateableElement::ownedTemplateSignature() const { // This is a read-write association end - QM_D(const QUmlTemplateableElement); - return d->ownedTemplateSignature; + return _ownedTemplateSignature; } void QUmlTemplateableElement::setOwnedTemplateSignature(QUmlTemplateSignature *ownedTemplateSignature) { // This is a read-write association end - QM_D(QUmlTemplateableElement); - if (d->ownedTemplateSignature != ownedTemplateSignature) { - d->ownedTemplateSignature = ownedTemplateSignature; + if (_ownedTemplateSignature != ownedTemplateSignature) { + _ownedTemplateSignature = ownedTemplateSignature; } } @@ -97,17 +87,15 @@ QSet<QUmlTemplateBinding *> QUmlTemplateableElement::templateBinding() const { // This is a read-write association end - QM_D(const QUmlTemplateableElement); - return d->templateBinding; + return _templateBinding; } void QUmlTemplateableElement::addTemplateBinding(QUmlTemplateBinding *templateBinding) { // This is a read-write association end - QM_D(QUmlTemplateableElement); - if (!d->templateBinding.contains(templateBinding)) { - d->templateBinding.insert(templateBinding); + if (!_templateBinding.contains(templateBinding)) { + _templateBinding.insert(templateBinding); } } @@ -115,9 +103,8 @@ void QUmlTemplateableElement::removeTemplateBinding(QUmlTemplateBinding *templat { // This is a read-write association end - QM_D(QUmlTemplateableElement); - if (d->templateBinding.contains(templateBinding)) { - d->templateBinding.remove(templateBinding); + if (_templateBinding.contains(templateBinding)) { + _templateBinding.remove(templateBinding); } } diff --git a/src/uml/qumltemplateableelement.h b/src/uml/qumltemplateableelement.h index fc2d9dca..f3367fc4 100644 --- a/src/uml/qumltemplateableelement.h +++ b/src/uml/qumltemplateableelement.h @@ -55,11 +55,10 @@ class QUmlParameterableElement; class QUmlTemplateBinding; class QUmlTemplateSignature; -class QUmlTemplateableElementPrivate; class Q_UML_EXPORT QUmlTemplateableElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN QUmlTemplateableElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlTemplateableElement(); // Owned attributes QUmlTemplateSignature *ownedTemplateSignature() const; @@ -71,6 +70,10 @@ public: // Operations bool isTemplate() const; QSet<QUmlParameterableElement *> parameterableElements() const; + +protected: + QUmlTemplateSignature *_ownedTemplateSignature; + QSet<QUmlTemplateBinding *> _templateBinding; }; QT_END_NAMESPACE diff --git a/src/uml/qumltemplateableelement_p.h b/src/uml/qumltemplateableelement_p.h deleted file mode 100644 index 0cdf23a4..00000000 --- a/src/uml/qumltemplateableelement_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTEMPLATEABLEELEMENT_P_H -#define QUMLTEMPLATEABLEELEMENT_P_H - -#include "QtUml/QUmlTemplateableElement" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTemplateableElementPrivate : public virtual QUmlElementPrivate -{ -public: - QUmlTemplateableElementPrivate(); - - QUmlTemplateSignature *ownedTemplateSignature; - QSet<QUmlTemplateBinding *> templateBinding; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTEMPLATEABLEELEMENT_P_H - diff --git a/src/uml/qumltemplatebinding.cpp b/src/uml/qumltemplatebinding.cpp index 8439b50f..614b3470 100644 --- a/src/uml/qumltemplatebinding.cpp +++ b/src/uml/qumltemplatebinding.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumltemplatebinding.h" -#include "qumltemplatebinding_p.h" #include <QtUml/QUmlTemplateableElement> #include <QtUml/QUmlTemplateParameterSubstitution> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlTemplateBindingPrivate::QUmlTemplateBindingPrivate() : - boundElement(0), - signature(0) -{ -} - /*! \class QUmlTemplateBinding @@ -61,11 +54,10 @@ QUmlTemplateBindingPrivate::QUmlTemplateBindingPrivate() : \brief A template binding represents a relationship between a templateable element and a template. A template binding specifies the substitutions of actual parameters for the formal parameters of the template. */ -QUmlTemplateBinding::QUmlTemplateBinding(bool create_d_ptr) : - QUmlDirectedRelationship(false) +QUmlTemplateBinding::QUmlTemplateBinding() : + _boundElement(0), + _signature(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTemplateBindingPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlTemplateableElement *QUmlTemplateBinding::boundElement() const { // This is a read-write association end - QM_D(const QUmlTemplateBinding); - return d->boundElement; + return _boundElement; } void QUmlTemplateBinding::setBoundElement(QUmlTemplateableElement *boundElement) { // This is a read-write association end - QM_D(QUmlTemplateBinding); - if (d->boundElement != boundElement) { - d->boundElement = boundElement; + if (_boundElement != boundElement) { + _boundElement = boundElement; } } @@ -98,17 +88,15 @@ QSet<QUmlTemplateParameterSubstitution *> QUmlTemplateBinding::parameterSubstitu { // This is a read-write association end - QM_D(const QUmlTemplateBinding); - return d->parameterSubstitution; + return _parameterSubstitution; } void QUmlTemplateBinding::addParameterSubstitution(QUmlTemplateParameterSubstitution *parameterSubstitution) { // This is a read-write association end - QM_D(QUmlTemplateBinding); - if (!d->parameterSubstitution.contains(parameterSubstitution)) { - d->parameterSubstitution.insert(parameterSubstitution); + if (!_parameterSubstitution.contains(parameterSubstitution)) { + _parameterSubstitution.insert(parameterSubstitution); } } @@ -116,9 +104,8 @@ void QUmlTemplateBinding::removeParameterSubstitution(QUmlTemplateParameterSubst { // This is a read-write association end - QM_D(QUmlTemplateBinding); - if (d->parameterSubstitution.contains(parameterSubstitution)) { - d->parameterSubstitution.remove(parameterSubstitution); + if (_parameterSubstitution.contains(parameterSubstitution)) { + _parameterSubstitution.remove(parameterSubstitution); } } @@ -129,17 +116,15 @@ QUmlTemplateSignature *QUmlTemplateBinding::signature() const { // This is a read-write association end - QM_D(const QUmlTemplateBinding); - return d->signature; + return _signature; } void QUmlTemplateBinding::setSignature(QUmlTemplateSignature *signature) { // This is a read-write association end - QM_D(QUmlTemplateBinding); - if (d->signature != signature) { - d->signature = signature; + if (_signature != signature) { + _signature = signature; } } diff --git a/src/uml/qumltemplatebinding.h b/src/uml/qumltemplatebinding.h index 6d6b09b5..2daedc47 100644 --- a/src/uml/qumltemplatebinding.h +++ b/src/uml/qumltemplatebinding.h @@ -55,11 +55,10 @@ class QUmlTemplateableElement; class QUmlTemplateParameterSubstitution; class QUmlTemplateSignature; -class QUmlTemplateBindingPrivate; class Q_UML_EXPORT QUmlTemplateBinding : public QUmlDirectedRelationship { public: - QUmlTemplateBinding(bool create_d_ptr = true); + QUmlTemplateBinding(); // Owned attributes QUmlTemplateableElement *boundElement() const; @@ -69,6 +68,11 @@ public: void removeParameterSubstitution(QUmlTemplateParameterSubstitution *parameterSubstitution); QUmlTemplateSignature *signature() const; void setSignature(QUmlTemplateSignature *signature); + +protected: + QUmlTemplateableElement *_boundElement; + QSet<QUmlTemplateParameterSubstitution *> _parameterSubstitution; + QUmlTemplateSignature *_signature; }; QT_END_NAMESPACE diff --git a/src/uml/qumltemplatebinding_p.h b/src/uml/qumltemplatebinding_p.h deleted file mode 100644 index c6998c91..00000000 --- a/src/uml/qumltemplatebinding_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTEMPLATEBINDING_P_H -#define QUMLTEMPLATEBINDING_P_H - -#include "QtUml/QUmlTemplateBinding" - -#include "private/qumldirectedrelationship_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTemplateBindingPrivate : public QUmlDirectedRelationshipPrivate -{ -public: - QUmlTemplateBindingPrivate(); - - QUmlTemplateableElement *boundElement; - QSet<QUmlTemplateParameterSubstitution *> parameterSubstitution; - QUmlTemplateSignature *signature; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTEMPLATEBINDING_P_H - diff --git a/src/uml/qumltemplateparameter.cpp b/src/uml/qumltemplateparameter.cpp index 77fe9da1..a6b59ec0 100644 --- a/src/uml/qumltemplateparameter.cpp +++ b/src/uml/qumltemplateparameter.cpp @@ -39,22 +39,12 @@ ** ****************************************************************************/ #include "qumltemplateparameter.h" -#include "qumltemplateparameter_p.h" #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateSignature> QT_BEGIN_NAMESPACE -QUmlTemplateParameterPrivate::QUmlTemplateParameterPrivate() : - default_(0), - ownedDefault(0), - ownedParameteredElement(0), - parameteredElement(0), - signature(0) -{ -} - /*! \class QUmlTemplateParameter @@ -63,11 +53,13 @@ QUmlTemplateParameterPrivate::QUmlTemplateParameterPrivate() : \brief A template parameter exposes a parameterable element as a formal template parameter of a template. */ -QUmlTemplateParameter::QUmlTemplateParameter(bool create_d_ptr) : - QUmlElement(false) +QUmlTemplateParameter::QUmlTemplateParameter() : + _default_(0), + _ownedDefault(0), + _ownedParameteredElement(0), + _parameteredElement(0), + _signature(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTemplateParameterPrivate); } // OWNED ATTRIBUTES @@ -79,17 +71,15 @@ QUmlParameterableElement *QUmlTemplateParameter::default_() const { // This is a read-write association end - QM_D(const QUmlTemplateParameter); - return d->default_; + return _default_; } void QUmlTemplateParameter::setDefault(QUmlParameterableElement *default_) { // This is a read-write association end - QM_D(QUmlTemplateParameter); - if (d->default_ != default_) { - d->default_ = default_; + if (_default_ != default_) { + _default_ = default_; } } @@ -100,17 +90,15 @@ QUmlParameterableElement *QUmlTemplateParameter::ownedDefault() const { // This is a read-write association end - QM_D(const QUmlTemplateParameter); - return d->ownedDefault; + return _ownedDefault; } void QUmlTemplateParameter::setOwnedDefault(QUmlParameterableElement *ownedDefault) { // This is a read-write association end - QM_D(QUmlTemplateParameter); - if (d->ownedDefault != ownedDefault) { - d->ownedDefault = ownedDefault; + if (_ownedDefault != ownedDefault) { + _ownedDefault = ownedDefault; } } @@ -121,17 +109,15 @@ QUmlParameterableElement *QUmlTemplateParameter::ownedParameteredElement() const { // This is a read-write association end - QM_D(const QUmlTemplateParameter); - return d->ownedParameteredElement; + return _ownedParameteredElement; } void QUmlTemplateParameter::setOwnedParameteredElement(QUmlParameterableElement *ownedParameteredElement) { // This is a read-write association end - QM_D(QUmlTemplateParameter); - if (d->ownedParameteredElement != ownedParameteredElement) { - d->ownedParameteredElement = ownedParameteredElement; + if (_ownedParameteredElement != ownedParameteredElement) { + _ownedParameteredElement = ownedParameteredElement; } } @@ -142,17 +128,15 @@ QUmlParameterableElement *QUmlTemplateParameter::parameteredElement() const { // This is a read-write association end - QM_D(const QUmlTemplateParameter); - return d->parameteredElement; + return _parameteredElement; } void QUmlTemplateParameter::setParameteredElement(QUmlParameterableElement *parameteredElement) { // This is a read-write association end - QM_D(QUmlTemplateParameter); - if (d->parameteredElement != parameteredElement) { - d->parameteredElement = parameteredElement; + if (_parameteredElement != parameteredElement) { + _parameteredElement = parameteredElement; } } @@ -163,17 +147,15 @@ QUmlTemplateSignature *QUmlTemplateParameter::signature() const { // This is a read-write association end - QM_D(const QUmlTemplateParameter); - return d->signature; + return _signature; } void QUmlTemplateParameter::setSignature(QUmlTemplateSignature *signature) { // This is a read-write association end - QM_D(QUmlTemplateParameter); - if (d->signature != signature) { - d->signature = signature; + if (_signature != signature) { + _signature = signature; } } diff --git a/src/uml/qumltemplateparameter.h b/src/uml/qumltemplateparameter.h index 83f3d625..1973234e 100644 --- a/src/uml/qumltemplateparameter.h +++ b/src/uml/qumltemplateparameter.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlParameterableElement; class QUmlTemplateSignature; -class QUmlTemplateParameterPrivate; class Q_UML_EXPORT QUmlTemplateParameter : public QUmlElement { public: - QUmlTemplateParameter(bool create_d_ptr = true); + QUmlTemplateParameter(); // Owned attributes QUmlParameterableElement *default_() const; @@ -71,6 +70,13 @@ public: void setParameteredElement(QUmlParameterableElement *parameteredElement); QUmlTemplateSignature *signature() const; void setSignature(QUmlTemplateSignature *signature); + +protected: + QUmlParameterableElement *_default_; + QUmlParameterableElement *_ownedDefault; + QUmlParameterableElement *_ownedParameteredElement; + QUmlParameterableElement *_parameteredElement; + QUmlTemplateSignature *_signature; }; QT_END_NAMESPACE diff --git a/src/uml/qumltemplateparameter_p.h b/src/uml/qumltemplateparameter_p.h deleted file mode 100644 index e79bfc25..00000000 --- a/src/uml/qumltemplateparameter_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTEMPLATEPARAMETER_P_H -#define QUMLTEMPLATEPARAMETER_P_H - -#include "QtUml/QUmlTemplateParameter" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTemplateParameterPrivate : public QUmlElementPrivate -{ -public: - QUmlTemplateParameterPrivate(); - - QUmlParameterableElement *default_; - QUmlParameterableElement *ownedDefault; - QUmlParameterableElement *ownedParameteredElement; - QUmlParameterableElement *parameteredElement; - QUmlTemplateSignature *signature; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTEMPLATEPARAMETER_P_H - diff --git a/src/uml/qumltemplateparametersubstitution.cpp b/src/uml/qumltemplateparametersubstitution.cpp index 780a3f7c..2ce548fe 100644 --- a/src/uml/qumltemplateparametersubstitution.cpp +++ b/src/uml/qumltemplateparametersubstitution.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumltemplateparametersubstitution.h" -#include "qumltemplateparametersubstitution_p.h" #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateBinding> @@ -47,14 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlTemplateParameterSubstitutionPrivate::QUmlTemplateParameterSubstitutionPrivate() : - actual(0), - formal(0), - ownedActual(0), - templateBinding(0) -{ -} - /*! \class QUmlTemplateParameterSubstitution @@ -63,11 +54,12 @@ QUmlTemplateParameterSubstitutionPrivate::QUmlTemplateParameterSubstitutionPriva \brief A template parameter substitution relates the actual parameter to a formal template parameter as part of a template binding. */ -QUmlTemplateParameterSubstitution::QUmlTemplateParameterSubstitution(bool create_d_ptr) : - QUmlElement(false) +QUmlTemplateParameterSubstitution::QUmlTemplateParameterSubstitution() : + _actual(0), + _formal(0), + _ownedActual(0), + _templateBinding(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTemplateParameterSubstitutionPrivate); } // OWNED ATTRIBUTES @@ -79,17 +71,15 @@ QUmlParameterableElement *QUmlTemplateParameterSubstitution::actual() const { // This is a read-write association end - QM_D(const QUmlTemplateParameterSubstitution); - return d->actual; + return _actual; } void QUmlTemplateParameterSubstitution::setActual(QUmlParameterableElement *actual) { // This is a read-write association end - QM_D(QUmlTemplateParameterSubstitution); - if (d->actual != actual) { - d->actual = actual; + if (_actual != actual) { + _actual = actual; } } @@ -100,17 +90,15 @@ QUmlTemplateParameter *QUmlTemplateParameterSubstitution::formal() const { // This is a read-write association end - QM_D(const QUmlTemplateParameterSubstitution); - return d->formal; + return _formal; } void QUmlTemplateParameterSubstitution::setFormal(QUmlTemplateParameter *formal) { // This is a read-write association end - QM_D(QUmlTemplateParameterSubstitution); - if (d->formal != formal) { - d->formal = formal; + if (_formal != formal) { + _formal = formal; } } @@ -121,17 +109,15 @@ QUmlParameterableElement *QUmlTemplateParameterSubstitution::ownedActual() const { // This is a read-write association end - QM_D(const QUmlTemplateParameterSubstitution); - return d->ownedActual; + return _ownedActual; } void QUmlTemplateParameterSubstitution::setOwnedActual(QUmlParameterableElement *ownedActual) { // This is a read-write association end - QM_D(QUmlTemplateParameterSubstitution); - if (d->ownedActual != ownedActual) { - d->ownedActual = ownedActual; + if (_ownedActual != ownedActual) { + _ownedActual = ownedActual; } } @@ -142,17 +128,15 @@ QUmlTemplateBinding *QUmlTemplateParameterSubstitution::templateBinding() const { // This is a read-write association end - QM_D(const QUmlTemplateParameterSubstitution); - return d->templateBinding; + return _templateBinding; } void QUmlTemplateParameterSubstitution::setTemplateBinding(QUmlTemplateBinding *templateBinding) { // This is a read-write association end - QM_D(QUmlTemplateParameterSubstitution); - if (d->templateBinding != templateBinding) { - d->templateBinding = templateBinding; + if (_templateBinding != templateBinding) { + _templateBinding = templateBinding; } } diff --git a/src/uml/qumltemplateparametersubstitution.h b/src/uml/qumltemplateparametersubstitution.h index ade87b92..a79c9bfa 100644 --- a/src/uml/qumltemplateparametersubstitution.h +++ b/src/uml/qumltemplateparametersubstitution.h @@ -55,11 +55,10 @@ class QUmlParameterableElement; class QUmlTemplateBinding; class QUmlTemplateParameter; -class QUmlTemplateParameterSubstitutionPrivate; class Q_UML_EXPORT QUmlTemplateParameterSubstitution : public QUmlElement { public: - QUmlTemplateParameterSubstitution(bool create_d_ptr = true); + QUmlTemplateParameterSubstitution(); // Owned attributes QUmlParameterableElement *actual() const; @@ -70,6 +69,12 @@ public: void setOwnedActual(QUmlParameterableElement *ownedActual); QUmlTemplateBinding *templateBinding() const; void setTemplateBinding(QUmlTemplateBinding *templateBinding); + +protected: + QUmlParameterableElement *_actual; + QUmlTemplateParameter *_formal; + QUmlParameterableElement *_ownedActual; + QUmlTemplateBinding *_templateBinding; }; QT_END_NAMESPACE diff --git a/src/uml/qumltemplateparametersubstitution_p.h b/src/uml/qumltemplateparametersubstitution_p.h deleted file mode 100644 index 040dce10..00000000 --- a/src/uml/qumltemplateparametersubstitution_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTEMPLATEPARAMETERSUBSTITUTION_P_H -#define QUMLTEMPLATEPARAMETERSUBSTITUTION_P_H - -#include "QtUml/QUmlTemplateParameterSubstitution" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTemplateParameterSubstitutionPrivate : public QUmlElementPrivate -{ -public: - QUmlTemplateParameterSubstitutionPrivate(); - - QUmlParameterableElement *actual; - QUmlTemplateParameter *formal; - QUmlParameterableElement *ownedActual; - QUmlTemplateBinding *templateBinding; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTEMPLATEPARAMETERSUBSTITUTION_P_H - diff --git a/src/uml/qumltemplatesignature.cpp b/src/uml/qumltemplatesignature.cpp index f0fd2c61..bcc71256 100644 --- a/src/uml/qumltemplatesignature.cpp +++ b/src/uml/qumltemplatesignature.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumltemplatesignature.h" -#include "qumltemplatesignature_p.h" #include <QtUml/QUmlTemplateableElement> #include <QtUml/QUmlTemplateParameter> QT_BEGIN_NAMESPACE -QUmlTemplateSignaturePrivate::QUmlTemplateSignaturePrivate() : - template_(0) -{ -} - /*! \class QUmlTemplateSignature @@ -59,11 +53,9 @@ QUmlTemplateSignaturePrivate::QUmlTemplateSignaturePrivate() : \brief A template signature bundles the set of formal template parameters for a templated element. */ -QUmlTemplateSignature::QUmlTemplateSignature(bool create_d_ptr) : - QUmlElement(false) +QUmlTemplateSignature::QUmlTemplateSignature() : + _template_(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTemplateSignaturePrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QList<QUmlTemplateParameter *> QUmlTemplateSignature::ownedParameter() const { // This is a read-write association end - QM_D(const QUmlTemplateSignature); - return d->ownedParameter; + return _ownedParameter; } void QUmlTemplateSignature::addOwnedParameter(QUmlTemplateParameter *ownedParameter) { // This is a read-write association end - QM_D(QUmlTemplateSignature); - if (!d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.append(ownedParameter); + if (!_ownedParameter.contains(ownedParameter)) { + _ownedParameter.append(ownedParameter); } } @@ -93,9 +83,8 @@ void QUmlTemplateSignature::removeOwnedParameter(QUmlTemplateParameter *ownedPar { // This is a read-write association end - QM_D(QUmlTemplateSignature); - if (d->ownedParameter.contains(ownedParameter)) { - d->ownedParameter.removeAll(ownedParameter); + if (_ownedParameter.contains(ownedParameter)) { + _ownedParameter.removeAll(ownedParameter); } } @@ -106,17 +95,15 @@ QList<QUmlTemplateParameter *> QUmlTemplateSignature::parameter() const { // This is a read-write association end - QM_D(const QUmlTemplateSignature); - return d->parameter; + return _parameter; } void QUmlTemplateSignature::addParameter(QUmlTemplateParameter *parameter) { // This is a read-write association end - QM_D(QUmlTemplateSignature); - if (!d->parameter.contains(parameter)) { - d->parameter.append(parameter); + if (!_parameter.contains(parameter)) { + _parameter.append(parameter); } } @@ -124,9 +111,8 @@ void QUmlTemplateSignature::removeParameter(QUmlTemplateParameter *parameter) { // This is a read-write association end - QM_D(QUmlTemplateSignature); - if (d->parameter.contains(parameter)) { - d->parameter.removeAll(parameter); + if (_parameter.contains(parameter)) { + _parameter.removeAll(parameter); } } @@ -137,17 +123,15 @@ QUmlTemplateableElement *QUmlTemplateSignature::template_() const { // This is a read-write association end - QM_D(const QUmlTemplateSignature); - return d->template_; + return _template_; } void QUmlTemplateSignature::setTemplate(QUmlTemplateableElement *template_) { // This is a read-write association end - QM_D(QUmlTemplateSignature); - if (d->template_ != template_) { - d->template_ = template_; + if (_template_ != template_) { + _template_ = template_; } } diff --git a/src/uml/qumltemplatesignature.h b/src/uml/qumltemplatesignature.h index 38bb0804..35e91f4f 100644 --- a/src/uml/qumltemplatesignature.h +++ b/src/uml/qumltemplatesignature.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlTemplateableElement; class QUmlTemplateParameter; -class QUmlTemplateSignaturePrivate; class Q_UML_EXPORT QUmlTemplateSignature : public virtual QUmlElement { public: - QUmlTemplateSignature(bool create_d_ptr = true); + QUmlTemplateSignature(); // Owned attributes QList<QUmlTemplateParameter *> ownedParameter() const; @@ -69,6 +68,11 @@ public: void removeParameter(QUmlTemplateParameter *parameter); QUmlTemplateableElement *template_() const; void setTemplate(QUmlTemplateableElement *template_); + +protected: + QList<QUmlTemplateParameter *> _ownedParameter; + QList<QUmlTemplateParameter *> _parameter; + QUmlTemplateableElement *_template_; }; QT_END_NAMESPACE diff --git a/src/uml/qumltemplatesignature_p.h b/src/uml/qumltemplatesignature_p.h deleted file mode 100644 index 0bceed5e..00000000 --- a/src/uml/qumltemplatesignature_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTEMPLATESIGNATURE_P_H -#define QUMLTEMPLATESIGNATURE_P_H - -#include "QtUml/QUmlTemplateSignature" - -#include "private/qumlelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTemplateSignaturePrivate : public virtual QUmlElementPrivate -{ -public: - QUmlTemplateSignaturePrivate(); - - QList<QUmlTemplateParameter *> ownedParameter; - QList<QUmlTemplateParameter *> parameter; - QUmlTemplateableElement *template_; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTEMPLATESIGNATURE_P_H - diff --git a/src/uml/qumltestidentityaction.cpp b/src/uml/qumltestidentityaction.cpp index c7f490a6..8ec259b7 100644 --- a/src/uml/qumltestidentityaction.cpp +++ b/src/uml/qumltestidentityaction.cpp @@ -39,20 +39,12 @@ ** ****************************************************************************/ #include "qumltestidentityaction.h" -#include "qumltestidentityaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlTestIdentityActionPrivate::QUmlTestIdentityActionPrivate() : - first(0), - result(0), - second(0) -{ -} - /*! \class QUmlTestIdentityAction @@ -61,11 +53,11 @@ QUmlTestIdentityActionPrivate::QUmlTestIdentityActionPrivate() : \brief A test identity action is an action that tests if two values are identical objects. */ -QUmlTestIdentityAction::QUmlTestIdentityAction(bool create_d_ptr) : - QUmlAction(false) +QUmlTestIdentityAction::QUmlTestIdentityAction() : + _first(0), + _result(0), + _second(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTestIdentityActionPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlInputPin *QUmlTestIdentityAction::first() const { // This is a read-write association end - QM_D(const QUmlTestIdentityAction); - return d->first; + return _first; } void QUmlTestIdentityAction::setFirst(QUmlInputPin *first) { // This is a read-write association end - QM_D(QUmlTestIdentityAction); - if (d->first != first) { - d->first = first; + if (_first != first) { + _first = first; } } @@ -98,17 +88,15 @@ QUmlOutputPin *QUmlTestIdentityAction::result() const { // This is a read-write association end - QM_D(const QUmlTestIdentityAction); - return d->result; + return _result; } void QUmlTestIdentityAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlTestIdentityAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } @@ -119,17 +107,15 @@ QUmlInputPin *QUmlTestIdentityAction::second() const { // This is a read-write association end - QM_D(const QUmlTestIdentityAction); - return d->second; + return _second; } void QUmlTestIdentityAction::setSecond(QUmlInputPin *second) { // This is a read-write association end - QM_D(QUmlTestIdentityAction); - if (d->second != second) { - d->second = second; + if (_second != second) { + _second = second; } } diff --git a/src/uml/qumltestidentityaction.h b/src/uml/qumltestidentityaction.h index a4741e76..6fa70560 100644 --- a/src/uml/qumltestidentityaction.h +++ b/src/uml/qumltestidentityaction.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlOutputPin; -class QUmlTestIdentityActionPrivate; class Q_UML_EXPORT QUmlTestIdentityAction : public QUmlAction { public: - QUmlTestIdentityAction(bool create_d_ptr = true); + QUmlTestIdentityAction(); // Owned attributes QUmlInputPin *first() const; @@ -67,6 +66,11 @@ public: void setResult(QUmlOutputPin *result); QUmlInputPin *second() const; void setSecond(QUmlInputPin *second); + +protected: + QUmlInputPin *_first; + QUmlOutputPin *_result; + QUmlInputPin *_second; }; QT_END_NAMESPACE diff --git a/src/uml/qumltestidentityaction_p.h b/src/uml/qumltestidentityaction_p.h deleted file mode 100644 index 8ddb0bfe..00000000 --- a/src/uml/qumltestidentityaction_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTESTIDENTITYACTION_P_H -#define QUMLTESTIDENTITYACTION_P_H - -#include "QtUml/QUmlTestIdentityAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTestIdentityActionPrivate : public QUmlActionPrivate -{ -public: - QUmlTestIdentityActionPrivate(); - - QUmlInputPin *first; - QUmlOutputPin *result; - QUmlInputPin *second; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTESTIDENTITYACTION_P_H - diff --git a/src/uml/qumltimeconstraint.cpp b/src/uml/qumltimeconstraint.cpp index 653f6a49..a961a7e2 100644 --- a/src/uml/qumltimeconstraint.cpp +++ b/src/uml/qumltimeconstraint.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumltimeconstraint.h" -#include "qumltimeconstraint_p.h" #include <QtUml/QUmlTimeInterval> QT_BEGIN_NAMESPACE -QUmlTimeConstraintPrivate::QUmlTimeConstraintPrivate() : - firstEvent(true), - specification(0) -{ -} - /*! \class QUmlTimeConstraint @@ -59,11 +52,10 @@ QUmlTimeConstraintPrivate::QUmlTimeConstraintPrivate() : \brief A time constraint is a constraint that refers to a time interval. */ -QUmlTimeConstraint::QUmlTimeConstraint(bool create_d_ptr) : - QUmlIntervalConstraint(false) +QUmlTimeConstraint::QUmlTimeConstraint() : + _firstEvent(true), + _specification(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTimeConstraintPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ bool QUmlTimeConstraint::firstEvent() const { // This is a read-write property - QM_D(const QUmlTimeConstraint); - return d->firstEvent; + return _firstEvent; } void QUmlTimeConstraint::setFirstEvent(bool firstEvent) { // This is a read-write property - QM_D(QUmlTimeConstraint); - if (d->firstEvent != firstEvent) { - d->firstEvent = firstEvent; + if (_firstEvent != firstEvent) { + _firstEvent = firstEvent; } } @@ -96,17 +86,15 @@ QUmlTimeInterval *QUmlTimeConstraint::specification() const { // This is a read-write association end - QM_D(const QUmlTimeConstraint); - return d->specification; + return _specification; } void QUmlTimeConstraint::setSpecification(QUmlTimeInterval *specification) { // This is a read-write association end - QM_D(QUmlTimeConstraint); - if (d->specification != specification) { - d->specification = specification; + if (_specification != specification) { + _specification = specification; } } diff --git a/src/uml/qumltimeconstraint.h b/src/uml/qumltimeconstraint.h index 896386fa..986b66bd 100644 --- a/src/uml/qumltimeconstraint.h +++ b/src/uml/qumltimeconstraint.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlTimeInterval; -class QUmlTimeConstraintPrivate; class Q_UML_EXPORT QUmlTimeConstraint : public QUmlIntervalConstraint { public: - QUmlTimeConstraint(bool create_d_ptr = true); + QUmlTimeConstraint(); // Owned attributes bool firstEvent() const; void setFirstEvent(bool firstEvent); QUmlTimeInterval *specification() const; void setSpecification(QUmlTimeInterval *specification); + +protected: + bool _firstEvent; + QUmlTimeInterval *_specification; }; QT_END_NAMESPACE diff --git a/src/uml/qumltimeconstraint_p.h b/src/uml/qumltimeconstraint_p.h deleted file mode 100644 index 21a8cfbd..00000000 --- a/src/uml/qumltimeconstraint_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTIMECONSTRAINT_P_H -#define QUMLTIMECONSTRAINT_P_H - -#include "QtUml/QUmlTimeConstraint" - -#include "private/qumlintervalconstraint_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTimeConstraintPrivate : public QUmlIntervalConstraintPrivate -{ -public: - QUmlTimeConstraintPrivate(); - - bool firstEvent; - QUmlTimeInterval *specification; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTIMECONSTRAINT_P_H - diff --git a/src/uml/qumltimeevent.cpp b/src/uml/qumltimeevent.cpp index da27a158..f53b8dcd 100644 --- a/src/uml/qumltimeevent.cpp +++ b/src/uml/qumltimeevent.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumltimeevent.h" -#include "qumltimeevent_p.h" #include <QtUml/QUmlTimeExpression> QT_BEGIN_NAMESPACE -QUmlTimeEventPrivate::QUmlTimeEventPrivate() : - isRelative(false), - when(0) -{ -} - /*! \class QUmlTimeEvent @@ -59,11 +52,10 @@ QUmlTimeEventPrivate::QUmlTimeEventPrivate() : \brief A time event can be defined relative to entering the current state of the executing state machine.A time event specifies a point in time. At the specified time, the event occurs. */ -QUmlTimeEvent::QUmlTimeEvent(bool create_d_ptr) : - QUmlEvent(false) +QUmlTimeEvent::QUmlTimeEvent() : + _isRelative(false), + _when(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTimeEventPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ bool QUmlTimeEvent::isRelative() const { // This is a read-write property - QM_D(const QUmlTimeEvent); - return d->isRelative; + return _isRelative; } void QUmlTimeEvent::setRelative(bool isRelative) { // This is a read-write property - QM_D(QUmlTimeEvent); - if (d->isRelative != isRelative) { - d->isRelative = isRelative; + if (_isRelative != isRelative) { + _isRelative = isRelative; } } @@ -96,17 +86,15 @@ QUmlTimeExpression *QUmlTimeEvent::when() const { // This is a read-write association end - QM_D(const QUmlTimeEvent); - return d->when; + return _when; } void QUmlTimeEvent::setWhen(QUmlTimeExpression *when) { // This is a read-write association end - QM_D(QUmlTimeEvent); - if (d->when != when) { - d->when = when; + if (_when != when) { + _when = when; } } diff --git a/src/uml/qumltimeevent.h b/src/uml/qumltimeevent.h index 54dce49f..88d2391c 100644 --- a/src/uml/qumltimeevent.h +++ b/src/uml/qumltimeevent.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlTimeExpression; -class QUmlTimeEventPrivate; class Q_UML_EXPORT QUmlTimeEvent : public QUmlEvent { public: - QUmlTimeEvent(bool create_d_ptr = true); + QUmlTimeEvent(); // Owned attributes bool isRelative() const; void setRelative(bool isRelative); QUmlTimeExpression *when() const; void setWhen(QUmlTimeExpression *when); + +protected: + bool _isRelative; + QUmlTimeExpression *_when; }; QT_END_NAMESPACE diff --git a/src/uml/qumltimeevent_p.h b/src/uml/qumltimeevent_p.h deleted file mode 100644 index f1a0a10e..00000000 --- a/src/uml/qumltimeevent_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTIMEEVENT_P_H -#define QUMLTIMEEVENT_P_H - -#include "QtUml/QUmlTimeEvent" - -#include "private/qumlevent_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTimeEventPrivate : public QUmlEventPrivate -{ -public: - QUmlTimeEventPrivate(); - - bool isRelative; - QUmlTimeExpression *when; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTIMEEVENT_P_H - diff --git a/src/uml/qumltimeexpression.cpp b/src/uml/qumltimeexpression.cpp index ec814f91..3b590294 100644 --- a/src/uml/qumltimeexpression.cpp +++ b/src/uml/qumltimeexpression.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumltimeexpression.h" -#include "qumltimeexpression_p.h" #include <QtUml/QUmlObservation> QT_BEGIN_NAMESPACE -QUmlTimeExpressionPrivate::QUmlTimeExpressionPrivate() : - expr(0) -{ -} - /*! \class QUmlTimeExpression @@ -58,11 +52,9 @@ QUmlTimeExpressionPrivate::QUmlTimeExpressionPrivate() : \brief A time expression defines a value specification that represents a time value. */ -QUmlTimeExpression::QUmlTimeExpression(bool create_d_ptr) : - QUmlValueSpecification(false) +QUmlTimeExpression::QUmlTimeExpression() : + _expr(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTimeExpressionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlValueSpecification *QUmlTimeExpression::expr() const { // This is a read-write association end - QM_D(const QUmlTimeExpression); - return d->expr; + return _expr; } void QUmlTimeExpression::setExpr(QUmlValueSpecification *expr) { // This is a read-write association end - QM_D(QUmlTimeExpression); - if (d->expr != expr) { - d->expr = expr; + if (_expr != expr) { + _expr = expr; } } @@ -95,17 +85,15 @@ QSet<QUmlObservation *> QUmlTimeExpression::observation() const { // This is a read-write association end - QM_D(const QUmlTimeExpression); - return d->observation; + return _observation; } void QUmlTimeExpression::addObservation(QUmlObservation *observation) { // This is a read-write association end - QM_D(QUmlTimeExpression); - if (!d->observation.contains(observation)) { - d->observation.insert(observation); + if (!_observation.contains(observation)) { + _observation.insert(observation); } } @@ -113,9 +101,8 @@ void QUmlTimeExpression::removeObservation(QUmlObservation *observation) { // This is a read-write association end - QM_D(QUmlTimeExpression); - if (d->observation.contains(observation)) { - d->observation.remove(observation); + if (_observation.contains(observation)) { + _observation.remove(observation); } } diff --git a/src/uml/qumltimeexpression.h b/src/uml/qumltimeexpression.h index 1fe59624..5cd1ef6c 100644 --- a/src/uml/qumltimeexpression.h +++ b/src/uml/qumltimeexpression.h @@ -53,11 +53,10 @@ QT_MODULE(QtUml) class QUmlObservation; -class QUmlTimeExpressionPrivate; class Q_UML_EXPORT QUmlTimeExpression : public QUmlValueSpecification { public: - QUmlTimeExpression(bool create_d_ptr = true); + QUmlTimeExpression(); // Owned attributes QUmlValueSpecification *expr() const; @@ -65,6 +64,10 @@ public: QSet<QUmlObservation *> observation() const; void addObservation(QUmlObservation *observation); void removeObservation(QUmlObservation *observation); + +protected: + QUmlValueSpecification *_expr; + QSet<QUmlObservation *> _observation; }; QT_END_NAMESPACE diff --git a/src/uml/qumltimeexpression_p.h b/src/uml/qumltimeexpression_p.h deleted file mode 100644 index 2f8e30ce..00000000 --- a/src/uml/qumltimeexpression_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTIMEEXPRESSION_P_H -#define QUMLTIMEEXPRESSION_P_H - -#include "QtUml/QUmlTimeExpression" - -#include "private/qumlvaluespecification_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTimeExpressionPrivate : public QUmlValueSpecificationPrivate -{ -public: - QUmlTimeExpressionPrivate(); - - QUmlValueSpecification *expr; - QSet<QUmlObservation *> observation; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTIMEEXPRESSION_P_H - diff --git a/src/uml/qumltimeinterval.cpp b/src/uml/qumltimeinterval.cpp index bc7598a0..ac3894ed 100644 --- a/src/uml/qumltimeinterval.cpp +++ b/src/uml/qumltimeinterval.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumltimeinterval.h" -#include "qumltimeinterval_p.h" #include <QtUml/QUmlTimeExpression> QT_BEGIN_NAMESPACE -QUmlTimeIntervalPrivate::QUmlTimeIntervalPrivate() : - max(0), - min(0) -{ -} - /*! \class QUmlTimeInterval @@ -59,11 +52,10 @@ QUmlTimeIntervalPrivate::QUmlTimeIntervalPrivate() : \brief A time interval defines the range between two time expressions. */ -QUmlTimeInterval::QUmlTimeInterval(bool create_d_ptr) : - QUmlInterval(false) +QUmlTimeInterval::QUmlTimeInterval() : + _max(0), + _min(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTimeIntervalPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlTimeExpression *QUmlTimeInterval::max() const { // This is a read-write association end - QM_D(const QUmlTimeInterval); - return d->max; + return _max; } void QUmlTimeInterval::setMax(QUmlTimeExpression *max) { // This is a read-write association end - QM_D(QUmlTimeInterval); - if (d->max != max) { - d->max = max; + if (_max != max) { + _max = max; } } @@ -96,17 +86,15 @@ QUmlTimeExpression *QUmlTimeInterval::min() const { // This is a read-write association end - QM_D(const QUmlTimeInterval); - return d->min; + return _min; } void QUmlTimeInterval::setMin(QUmlTimeExpression *min) { // This is a read-write association end - QM_D(QUmlTimeInterval); - if (d->min != min) { - d->min = min; + if (_min != min) { + _min = min; } } diff --git a/src/uml/qumltimeinterval.h b/src/uml/qumltimeinterval.h index 06183c5a..4b0fca5e 100644 --- a/src/uml/qumltimeinterval.h +++ b/src/uml/qumltimeinterval.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlTimeExpression; -class QUmlTimeIntervalPrivate; class Q_UML_EXPORT QUmlTimeInterval : public QUmlInterval { public: - QUmlTimeInterval(bool create_d_ptr = true); + QUmlTimeInterval(); // Owned attributes QUmlTimeExpression *max() const; void setMax(QUmlTimeExpression *max); QUmlTimeExpression *min() const; void setMin(QUmlTimeExpression *min); + +protected: + QUmlTimeExpression *_max; + QUmlTimeExpression *_min; }; QT_END_NAMESPACE diff --git a/src/uml/qumltimeinterval_p.h b/src/uml/qumltimeinterval_p.h deleted file mode 100644 index 5edd4fed..00000000 --- a/src/uml/qumltimeinterval_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTIMEINTERVAL_P_H -#define QUMLTIMEINTERVAL_P_H - -#include "QtUml/QUmlTimeInterval" - -#include "private/qumlinterval_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTimeIntervalPrivate : public QUmlIntervalPrivate -{ -public: - QUmlTimeIntervalPrivate(); - - QUmlTimeExpression *max; - QUmlTimeExpression *min; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTIMEINTERVAL_P_H - diff --git a/src/uml/qumltimeobservation.cpp b/src/uml/qumltimeobservation.cpp index 7fc0c228..0ce4ebf4 100644 --- a/src/uml/qumltimeobservation.cpp +++ b/src/uml/qumltimeobservation.cpp @@ -39,18 +39,11 @@ ** ****************************************************************************/ #include "qumltimeobservation.h" -#include "qumltimeobservation_p.h" #include <QtUml/QUmlNamedElement> QT_BEGIN_NAMESPACE -QUmlTimeObservationPrivate::QUmlTimeObservationPrivate() : - event(0), - firstEvent(true) -{ -} - /*! \class QUmlTimeObservation @@ -59,11 +52,10 @@ QUmlTimeObservationPrivate::QUmlTimeObservationPrivate() : \brief A time observation is a reference to a time instant during an execution. It points out the element in the model to observe and whether the observation is when this model element is entered or when it is exited. */ -QUmlTimeObservation::QUmlTimeObservation(bool create_d_ptr) : - QUmlObservation(false) +QUmlTimeObservation::QUmlTimeObservation() : + _event(0), + _firstEvent(true) { - if (create_d_ptr) - set_d_ptr(new QUmlTimeObservationPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlNamedElement *QUmlTimeObservation::event() const { // This is a read-write association end - QM_D(const QUmlTimeObservation); - return d->event; + return _event; } void QUmlTimeObservation::setEvent(QUmlNamedElement *event) { // This is a read-write association end - QM_D(QUmlTimeObservation); - if (d->event != event) { - d->event = event; + if (_event != event) { + _event = event; } } @@ -96,17 +86,15 @@ bool QUmlTimeObservation::firstEvent() const { // This is a read-write property - QM_D(const QUmlTimeObservation); - return d->firstEvent; + return _firstEvent; } void QUmlTimeObservation::setFirstEvent(bool firstEvent) { // This is a read-write property - QM_D(QUmlTimeObservation); - if (d->firstEvent != firstEvent) { - d->firstEvent = firstEvent; + if (_firstEvent != firstEvent) { + _firstEvent = firstEvent; } } diff --git a/src/uml/qumltimeobservation.h b/src/uml/qumltimeobservation.h index a1b448d9..0dfcd7ae 100644 --- a/src/uml/qumltimeobservation.h +++ b/src/uml/qumltimeobservation.h @@ -53,17 +53,20 @@ QT_MODULE(QtUml) class QUmlNamedElement; -class QUmlTimeObservationPrivate; class Q_UML_EXPORT QUmlTimeObservation : public QUmlObservation { public: - QUmlTimeObservation(bool create_d_ptr = true); + QUmlTimeObservation(); // Owned attributes QUmlNamedElement *event() const; void setEvent(QUmlNamedElement *event); bool firstEvent() const; void setFirstEvent(bool firstEvent); + +protected: + QUmlNamedElement *_event; + bool _firstEvent; }; QT_END_NAMESPACE diff --git a/src/uml/qumltimeobservation_p.h b/src/uml/qumltimeobservation_p.h deleted file mode 100644 index 50d74c49..00000000 --- a/src/uml/qumltimeobservation_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTIMEOBSERVATION_P_H -#define QUMLTIMEOBSERVATION_P_H - -#include "QtUml/QUmlTimeObservation" - -#include "private/qumlobservation_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTimeObservationPrivate : public QUmlObservationPrivate -{ -public: - QUmlTimeObservationPrivate(); - - QUmlNamedElement *event; - bool firstEvent; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTIMEOBSERVATION_P_H - diff --git a/src/uml/qumltransition.cpp b/src/uml/qumltransition.cpp index 152155b4..f998f977 100644 --- a/src/uml/qumltransition.cpp +++ b/src/uml/qumltransition.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumltransition.h" -#include "qumltransition_p.h" #include <QtUml/QUmlBehavior> #include <QtUml/QUmlClassifier> @@ -51,17 +50,6 @@ QT_BEGIN_NAMESPACE -QUmlTransitionPrivate::QUmlTransitionPrivate() : - container(0), - effect(0), - guard(0), - kind(QtUml::TransitionExternal), - redefinedTransition(0), - source(0), - target(0) -{ -} - /*! \class QUmlTransition @@ -70,12 +58,15 @@ QUmlTransitionPrivate::QUmlTransitionPrivate() : \brief A transition is a directed relationship between a source vertex and a target vertex. It may be part of a compound transition, which takes the state machine from one state configuration to another, representing the complete response of the state machine to an occurrence of an event of a particular type. */ -QUmlTransition::QUmlTransition(bool create_d_ptr) : - QUmlRedefinableElement(false), - QUmlNamespace(false) +QUmlTransition::QUmlTransition() : + _container(0), + _effect(0), + _guard(0), + _kind(QtUml::TransitionExternal), + _redefinedTransition(0), + _source(0), + _target(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTransitionPrivate); } // OWNED ATTRIBUTES @@ -87,17 +78,15 @@ QUmlRegion *QUmlTransition::container() const { // This is a read-write association end - QM_D(const QUmlTransition); - return d->container; + return _container; } void QUmlTransition::setContainer(QUmlRegion *container) { // This is a read-write association end - QM_D(QUmlTransition); - if (d->container != container) { - d->container = container; + if (_container != container) { + _container = container; } } @@ -108,17 +97,15 @@ QUmlBehavior *QUmlTransition::effect() const { // This is a read-write association end - QM_D(const QUmlTransition); - return d->effect; + return _effect; } void QUmlTransition::setEffect(QUmlBehavior *effect) { // This is a read-write association end - QM_D(QUmlTransition); - if (d->effect != effect) { - d->effect = effect; + if (_effect != effect) { + _effect = effect; } } @@ -129,17 +116,15 @@ QUmlConstraint *QUmlTransition::guard() const { // This is a read-write association end - QM_D(const QUmlTransition); - return d->guard; + return _guard; } void QUmlTransition::setGuard(QUmlConstraint *guard) { // This is a read-write association end - QM_D(QUmlTransition); - if (d->guard != guard) { - d->guard = guard; + if (_guard != guard) { + _guard = guard; } } @@ -150,17 +135,15 @@ QtUml::TransitionKind QUmlTransition::kind() const { // This is a read-write property - QM_D(const QUmlTransition); - return d->kind; + return _kind; } void QUmlTransition::setKind(QtUml::TransitionKind kind) { // This is a read-write property - QM_D(QUmlTransition); - if (d->kind != kind) { - d->kind = kind; + if (_kind != kind) { + _kind = kind; } } @@ -171,17 +154,15 @@ QUmlTransition *QUmlTransition::redefinedTransition() const { // This is a read-write association end - QM_D(const QUmlTransition); - return d->redefinedTransition; + return _redefinedTransition; } void QUmlTransition::setRedefinedTransition(QUmlTransition *redefinedTransition) { // This is a read-write association end - QM_D(QUmlTransition); - if (d->redefinedTransition != redefinedTransition) { - d->redefinedTransition = redefinedTransition; + if (_redefinedTransition != redefinedTransition) { + _redefinedTransition = redefinedTransition; } } @@ -204,17 +185,15 @@ QUmlVertex *QUmlTransition::source() const { // This is a read-write association end - QM_D(const QUmlTransition); - return d->source; + return _source; } void QUmlTransition::setSource(QUmlVertex *source) { // This is a read-write association end - QM_D(QUmlTransition); - if (d->source != source) { - d->source = source; + if (_source != source) { + _source = source; } } @@ -225,17 +204,15 @@ QUmlVertex *QUmlTransition::target() const { // This is a read-write association end - QM_D(const QUmlTransition); - return d->target; + return _target; } void QUmlTransition::setTarget(QUmlVertex *target) { // This is a read-write association end - QM_D(QUmlTransition); - if (d->target != target) { - d->target = target; + if (_target != target) { + _target = target; } } @@ -246,17 +223,15 @@ QSet<QUmlTrigger *> QUmlTransition::trigger() const { // This is a read-write association end - QM_D(const QUmlTransition); - return d->trigger; + return _trigger; } void QUmlTransition::addTrigger(QUmlTrigger *trigger) { // This is a read-write association end - QM_D(QUmlTransition); - if (!d->trigger.contains(trigger)) { - d->trigger.insert(trigger); + if (!_trigger.contains(trigger)) { + _trigger.insert(trigger); } } @@ -264,9 +239,8 @@ void QUmlTransition::removeTrigger(QUmlTrigger *trigger) { // This is a read-write association end - QM_D(QUmlTransition); - if (d->trigger.contains(trigger)) { - d->trigger.remove(trigger); + if (_trigger.contains(trigger)) { + _trigger.remove(trigger); } } diff --git a/src/uml/qumltransition.h b/src/uml/qumltransition.h index d8ba79dc..1ca26dd7 100644 --- a/src/uml/qumltransition.h +++ b/src/uml/qumltransition.h @@ -61,11 +61,10 @@ class QUmlStateMachine; class QUmlTrigger; class QUmlVertex; -class QUmlTransitionPrivate; class Q_UML_EXPORT QUmlTransition : public QUmlRedefinableElement, public QUmlNamespace { public: - QUmlTransition(bool create_d_ptr = true); + QUmlTransition(); // Owned attributes QUmlRegion *container() const; @@ -90,6 +89,16 @@ public: // Operations QUmlStateMachine *containingStateMachine() const; bool isConsistentWith(QUmlRedefinableElement *redefinee) const; + +protected: + QUmlRegion *_container; + QUmlBehavior *_effect; + QUmlConstraint *_guard; + QtUml::TransitionKind _kind; + QUmlTransition *_redefinedTransition; + QUmlVertex *_source; + QUmlVertex *_target; + QSet<QUmlTrigger *> _trigger; }; QT_END_NAMESPACE diff --git a/src/uml/qumltransition_p.h b/src/uml/qumltransition_p.h deleted file mode 100644 index 65be342b..00000000 --- a/src/uml/qumltransition_p.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTRANSITION_P_H -#define QUMLTRANSITION_P_H - -#include "QtUml/QUmlTransition" - -#include "private/qumlredefinableelement_p.h" -#include "private/qumlnamespace_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTransitionPrivate : public QUmlRedefinableElementPrivate, public QUmlNamespacePrivate -{ -public: - QUmlTransitionPrivate(); - - QUmlRegion *container; - QUmlBehavior *effect; - QUmlConstraint *guard; - QtUml::TransitionKind kind; - QUmlTransition *redefinedTransition; - QUmlVertex *source; - QUmlVertex *target; - QSet<QUmlTrigger *> trigger; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTRANSITION_P_H - diff --git a/src/uml/qumltrigger.cpp b/src/uml/qumltrigger.cpp index 2d60b309..c18b07dc 100644 --- a/src/uml/qumltrigger.cpp +++ b/src/uml/qumltrigger.cpp @@ -39,18 +39,12 @@ ** ****************************************************************************/ #include "qumltrigger.h" -#include "qumltrigger_p.h" #include <QtUml/QUmlEvent> #include <QtUml/QUmlPort> QT_BEGIN_NAMESPACE -QUmlTriggerPrivate::QUmlTriggerPrivate() : - event(0) -{ -} - /*! \class QUmlTrigger @@ -59,11 +53,9 @@ QUmlTriggerPrivate::QUmlTriggerPrivate() : \brief A trigger specification may be qualified by the port on which the event occurred.A trigger relates an event to a behavior that may affect an instance of the classifier. */ -QUmlTrigger::QUmlTrigger(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlTrigger::QUmlTrigger() : + _event(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTriggerPrivate); } // OWNED ATTRIBUTES @@ -75,17 +67,15 @@ QUmlEvent *QUmlTrigger::event() const { // This is a read-write association end - QM_D(const QUmlTrigger); - return d->event; + return _event; } void QUmlTrigger::setEvent(QUmlEvent *event) { // This is a read-write association end - QM_D(QUmlTrigger); - if (d->event != event) { - d->event = event; + if (_event != event) { + _event = event; } } @@ -96,17 +86,15 @@ QSet<QUmlPort *> QUmlTrigger::port() const { // This is a read-write association end - QM_D(const QUmlTrigger); - return d->port; + return _port; } void QUmlTrigger::addPort(QUmlPort *port) { // This is a read-write association end - QM_D(QUmlTrigger); - if (!d->port.contains(port)) { - d->port.insert(port); + if (!_port.contains(port)) { + _port.insert(port); } } @@ -114,9 +102,8 @@ void QUmlTrigger::removePort(QUmlPort *port) { // This is a read-write association end - QM_D(QUmlTrigger); - if (d->port.contains(port)) { - d->port.remove(port); + if (_port.contains(port)) { + _port.remove(port); } } diff --git a/src/uml/qumltrigger.h b/src/uml/qumltrigger.h index f0a3dbc6..90aa098e 100644 --- a/src/uml/qumltrigger.h +++ b/src/uml/qumltrigger.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlEvent; class QUmlPort; -class QUmlTriggerPrivate; class Q_UML_EXPORT QUmlTrigger : public QUmlNamedElement { public: - QUmlTrigger(bool create_d_ptr = true); + QUmlTrigger(); // Owned attributes QUmlEvent *event() const; @@ -66,6 +65,10 @@ public: QSet<QUmlPort *> port() const; void addPort(QUmlPort *port); void removePort(QUmlPort *port); + +protected: + QUmlEvent *_event; + QSet<QUmlPort *> _port; }; QT_END_NAMESPACE diff --git a/src/uml/qumltrigger_p.h b/src/uml/qumltrigger_p.h deleted file mode 100644 index 669de33f..00000000 --- a/src/uml/qumltrigger_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTRIGGER_P_H -#define QUMLTRIGGER_P_H - -#include "QtUml/QUmlTrigger" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTriggerPrivate : public QUmlNamedElementPrivate -{ -public: - QUmlTriggerPrivate(); - - QUmlEvent *event; - QSet<QUmlPort *> port; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTRIGGER_P_H - diff --git a/src/uml/qumltype.cpp b/src/uml/qumltype.cpp index b5f8b560..d44ff6d1 100644 --- a/src/uml/qumltype.cpp +++ b/src/uml/qumltype.cpp @@ -39,15 +39,9 @@ ** ****************************************************************************/ #include "qumltype.h" -#include "qumltype_p.h" QT_BEGIN_NAMESPACE -QUmlTypePrivate::QUmlTypePrivate() : - package(0) -{ -} - /*! \class QUmlType @@ -56,11 +50,9 @@ QUmlTypePrivate::QUmlTypePrivate() : \brief A type is a named element that is used as the type for a typed element. A type can be contained in a package.A type constrains the values represented by a typed element. */ -QUmlType::QUmlType(bool create_d_ptr) : - QUmlPackageableElement(false) +QUmlType::QUmlType() : + _package(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTypePrivate); } // OWNED ATTRIBUTES @@ -72,17 +64,15 @@ QUmlPackage *QUmlType::package() const { // This is a read-write association end - QM_D(const QUmlType); - return d->package; + return _package; } void QUmlType::setPackage(QUmlPackage *package) { // This is a read-write association end - QM_D(QUmlType); - if (d->package != package) { - d->package = package; + if (_package != package) { + _package = package; } } diff --git a/src/uml/qumltype.h b/src/uml/qumltype.h index e6fa6911..ceec1a62 100644 --- a/src/uml/qumltype.h +++ b/src/uml/qumltype.h @@ -51,11 +51,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlTypePrivate; class Q_UML_EXPORT QUmlType : public QUmlPackageableElement { public: - Q_DECL_HIDDEN QUmlType(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlType(); // Owned attributes QUmlPackage *package() const; @@ -63,6 +62,9 @@ public: // Operations bool conformsTo(QUmlType *other) const; + +protected: + QUmlPackage *_package; }; QT_END_NAMESPACE diff --git a/src/uml/qumltype_p.h b/src/uml/qumltype_p.h deleted file mode 100644 index 6369c33e..00000000 --- a/src/uml/qumltype_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTYPE_P_H -#define QUMLTYPE_P_H - -#include "QtUml/QUmlType" - -#include "private/qumlpackageableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTypePrivate : public QUmlPackageableElementPrivate -{ -public: - QUmlTypePrivate(); - - QUmlPackage *package; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTYPE_P_H - diff --git a/src/uml/qumltypedelement.cpp b/src/uml/qumltypedelement.cpp index 4f68f669..264d58d3 100644 --- a/src/uml/qumltypedelement.cpp +++ b/src/uml/qumltypedelement.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumltypedelement.h" -#include "qumltypedelement_p.h" #include <QtUml/QUmlType> QT_BEGIN_NAMESPACE -QUmlTypedElementPrivate::QUmlTypedElementPrivate() : - type(0) -{ -} - /*! \class QUmlTypedElement @@ -58,11 +52,9 @@ QUmlTypedElementPrivate::QUmlTypedElementPrivate() : \brief A typed element is a kind of named element that represents an element with a type.A typed element has a type. */ -QUmlTypedElement::QUmlTypedElement(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlTypedElement::QUmlTypedElement() : + _type(0) { - if (create_d_ptr) - set_d_ptr(new QUmlTypedElementPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlType *QUmlTypedElement::type() const { // This is a read-write association end - QM_D(const QUmlTypedElement); - return d->type; + return _type; } void QUmlTypedElement::setType(QUmlType *type) { // This is a read-write association end - QM_D(QUmlTypedElement); - if (d->type != type) { - d->type = type; + if (_type != type) { + _type = type; } } diff --git a/src/uml/qumltypedelement.h b/src/uml/qumltypedelement.h index 2d738bb9..0cd56545 100644 --- a/src/uml/qumltypedelement.h +++ b/src/uml/qumltypedelement.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlType; -class QUmlTypedElementPrivate; class Q_UML_EXPORT QUmlTypedElement : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlTypedElement(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlTypedElement(); // Owned attributes QUmlType *type() const; void setType(QUmlType *type); + +protected: + QUmlType *_type; }; QT_END_NAMESPACE diff --git a/src/uml/qumltypedelement_p.h b/src/uml/qumltypedelement_p.h deleted file mode 100644 index 5a2e8afa..00000000 --- a/src/uml/qumltypedelement_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLTYPEDELEMENT_P_H -#define QUMLTYPEDELEMENT_P_H - -#include "QtUml/QUmlTypedElement" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlTypedElementPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlTypedElementPrivate(); - - QUmlType *type; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLTYPEDELEMENT_P_H - diff --git a/src/uml/qumlunmarshallaction.cpp b/src/uml/qumlunmarshallaction.cpp index a5bd7f92..85d1ebe2 100644 --- a/src/uml/qumlunmarshallaction.cpp +++ b/src/uml/qumlunmarshallaction.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlunmarshallaction.h" -#include "qumlunmarshallaction_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlInputPin> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlUnmarshallActionPrivate::QUmlUnmarshallActionPrivate() : - object(0), - unmarshallType(0) -{ -} - /*! \class QUmlUnmarshallAction @@ -61,11 +54,10 @@ QUmlUnmarshallActionPrivate::QUmlUnmarshallActionPrivate() : \brief An unmarshall action is an action that breaks an object of a known type into outputs each of which is equal to a value from a structural feature of the object. */ -QUmlUnmarshallAction::QUmlUnmarshallAction(bool create_d_ptr) : - QUmlAction(false) +QUmlUnmarshallAction::QUmlUnmarshallAction() : + _object(0), + _unmarshallType(0) { - if (create_d_ptr) - set_d_ptr(new QUmlUnmarshallActionPrivate); } // OWNED ATTRIBUTES @@ -77,17 +69,15 @@ QUmlInputPin *QUmlUnmarshallAction::object() const { // This is a read-write association end - QM_D(const QUmlUnmarshallAction); - return d->object; + return _object; } void QUmlUnmarshallAction::setObject(QUmlInputPin *object) { // This is a read-write association end - QM_D(QUmlUnmarshallAction); - if (d->object != object) { - d->object = object; + if (_object != object) { + _object = object; } } @@ -98,17 +88,15 @@ QSet<QUmlOutputPin *> QUmlUnmarshallAction::result() const { // This is a read-write association end - QM_D(const QUmlUnmarshallAction); - return d->result; + return _result; } void QUmlUnmarshallAction::addResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlUnmarshallAction); - if (!d->result.contains(result)) { - d->result.insert(result); + if (!_result.contains(result)) { + _result.insert(result); } } @@ -116,9 +104,8 @@ void QUmlUnmarshallAction::removeResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlUnmarshallAction); - if (d->result.contains(result)) { - d->result.remove(result); + if (_result.contains(result)) { + _result.remove(result); } } @@ -129,17 +116,15 @@ QUmlClassifier *QUmlUnmarshallAction::unmarshallType() const { // This is a read-write association end - QM_D(const QUmlUnmarshallAction); - return d->unmarshallType; + return _unmarshallType; } void QUmlUnmarshallAction::setUnmarshallType(QUmlClassifier *unmarshallType) { // This is a read-write association end - QM_D(QUmlUnmarshallAction); - if (d->unmarshallType != unmarshallType) { - d->unmarshallType = unmarshallType; + if (_unmarshallType != unmarshallType) { + _unmarshallType = unmarshallType; } } diff --git a/src/uml/qumlunmarshallaction.h b/src/uml/qumlunmarshallaction.h index 468797fc..5111d50e 100644 --- a/src/uml/qumlunmarshallaction.h +++ b/src/uml/qumlunmarshallaction.h @@ -55,11 +55,10 @@ class QUmlClassifier; class QUmlInputPin; class QUmlOutputPin; -class QUmlUnmarshallActionPrivate; class Q_UML_EXPORT QUmlUnmarshallAction : public QUmlAction { public: - QUmlUnmarshallAction(bool create_d_ptr = true); + QUmlUnmarshallAction(); // Owned attributes QUmlInputPin *object() const; @@ -69,6 +68,11 @@ public: void removeResult(QUmlOutputPin *result); QUmlClassifier *unmarshallType() const; void setUnmarshallType(QUmlClassifier *unmarshallType); + +protected: + QUmlInputPin *_object; + QSet<QUmlOutputPin *> _result; + QUmlClassifier *_unmarshallType; }; QT_END_NAMESPACE diff --git a/src/uml/qumlunmarshallaction_p.h b/src/uml/qumlunmarshallaction_p.h deleted file mode 100644 index abe0c4f4..00000000 --- a/src/uml/qumlunmarshallaction_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLUNMARSHALLACTION_P_H -#define QUMLUNMARSHALLACTION_P_H - -#include "QtUml/QUmlUnmarshallAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlUnmarshallActionPrivate : public QUmlActionPrivate -{ -public: - QUmlUnmarshallActionPrivate(); - - QUmlInputPin *object; - QSet<QUmlOutputPin *> result; - QUmlClassifier *unmarshallType; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLUNMARSHALLACTION_P_H - diff --git a/src/uml/qumlusage.cpp b/src/uml/qumlusage.cpp index 475efd1f..1b7bec5d 100644 --- a/src/uml/qumlusage.cpp +++ b/src/uml/qumlusage.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlusage.h" -#include "qumlusage_p.h" QT_BEGIN_NAMESPACE -QUmlUsagePrivate::QUmlUsagePrivate() -{ -} - /*! \class QUmlUsage @@ -55,11 +50,8 @@ QUmlUsagePrivate::QUmlUsagePrivate() \brief A usage is a relationship in which one element requires another element (or set of elements) for its full implementation or operation. A usage is a dependency in which the client requires the presence of the supplier. */ -QUmlUsage::QUmlUsage(bool create_d_ptr) : - QUmlDependency(false) +QUmlUsage::QUmlUsage() { - if (create_d_ptr) - set_d_ptr(new QUmlUsagePrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlusage.h b/src/uml/qumlusage.h index 2087fe91..05ea20af 100644 --- a/src/uml/qumlusage.h +++ b/src/uml/qumlusage.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlUsagePrivate; class Q_UML_EXPORT QUmlUsage : public QUmlDependency { public: - QUmlUsage(bool create_d_ptr = true); + QUmlUsage(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlusage_p.h b/src/uml/qumlusage_p.h deleted file mode 100644 index a108459d..00000000 --- a/src/uml/qumlusage_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLUSAGE_P_H -#define QUMLUSAGE_P_H - -#include "QtUml/QUmlUsage" - -#include "private/qumldependency_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlUsagePrivate : public QUmlDependencyPrivate -{ -public: - QUmlUsagePrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLUSAGE_P_H - diff --git a/src/uml/qumlusecase.cpp b/src/uml/qumlusecase.cpp index a14eb9bf..84d87f15 100644 --- a/src/uml/qumlusecase.cpp +++ b/src/uml/qumlusecase.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlusecase.h" -#include "qumlusecase_p.h" #include <QtUml/QUmlClassifier> #include <QtUml/QUmlExtend> @@ -48,10 +47,6 @@ QT_BEGIN_NAMESPACE -QUmlUseCasePrivate::QUmlUseCasePrivate() -{ -} - /*! \class QUmlUseCase @@ -60,11 +55,8 @@ QUmlUseCasePrivate::QUmlUseCasePrivate() \brief A use case is the specification of a set of actions performed by a system, which yields an observable result that is, typically, of value for one or more actors or other stakeholders of the system. */ -QUmlUseCase::QUmlUseCase(bool create_d_ptr) : - QUmlBehavioredClassifier(false) +QUmlUseCase::QUmlUseCase() { - if (create_d_ptr) - set_d_ptr(new QUmlUseCasePrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QSet<QUmlExtend *> QUmlUseCase::extend() const { // This is a read-write association end - QM_D(const QUmlUseCase); - return d->extend; + return _extend; } void QUmlUseCase::addExtend(QUmlExtend *extend) { // This is a read-write association end - QM_D(QUmlUseCase); - if (!d->extend.contains(extend)) { - d->extend.insert(extend); + if (!_extend.contains(extend)) { + _extend.insert(extend); } } @@ -94,9 +84,8 @@ void QUmlUseCase::removeExtend(QUmlExtend *extend) { // This is a read-write association end - QM_D(QUmlUseCase); - if (d->extend.contains(extend)) { - d->extend.remove(extend); + if (_extend.contains(extend)) { + _extend.remove(extend); } } @@ -107,17 +96,15 @@ QSet<QUmlExtensionPoint *> QUmlUseCase::extensionPoint() const { // This is a read-write association end - QM_D(const QUmlUseCase); - return d->extensionPoint; + return _extensionPoint; } void QUmlUseCase::addExtensionPoint(QUmlExtensionPoint *extensionPoint) { // This is a read-write association end - QM_D(QUmlUseCase); - if (!d->extensionPoint.contains(extensionPoint)) { - d->extensionPoint.insert(extensionPoint); + if (!_extensionPoint.contains(extensionPoint)) { + _extensionPoint.insert(extensionPoint); } } @@ -125,9 +112,8 @@ void QUmlUseCase::removeExtensionPoint(QUmlExtensionPoint *extensionPoint) { // This is a read-write association end - QM_D(QUmlUseCase); - if (d->extensionPoint.contains(extensionPoint)) { - d->extensionPoint.remove(extensionPoint); + if (_extensionPoint.contains(extensionPoint)) { + _extensionPoint.remove(extensionPoint); } } @@ -138,17 +124,15 @@ QSet<QUmlInclude *> QUmlUseCase::include() const { // This is a read-write association end - QM_D(const QUmlUseCase); - return d->include; + return _include; } void QUmlUseCase::addInclude(QUmlInclude *include) { // This is a read-write association end - QM_D(QUmlUseCase); - if (!d->include.contains(include)) { - d->include.insert(include); + if (!_include.contains(include)) { + _include.insert(include); } } @@ -156,9 +140,8 @@ void QUmlUseCase::removeInclude(QUmlInclude *include) { // This is a read-write association end - QM_D(QUmlUseCase); - if (d->include.contains(include)) { - d->include.remove(include); + if (_include.contains(include)) { + _include.remove(include); } } @@ -169,17 +152,15 @@ QSet<QUmlClassifier *> QUmlUseCase::subject() const { // This is a read-write association end - QM_D(const QUmlUseCase); - return d->subject; + return _subject; } void QUmlUseCase::addSubject(QUmlClassifier *subject) { // This is a read-write association end - QM_D(QUmlUseCase); - if (!d->subject.contains(subject)) { - d->subject.insert(subject); + if (!_subject.contains(subject)) { + _subject.insert(subject); } } @@ -187,9 +168,8 @@ void QUmlUseCase::removeSubject(QUmlClassifier *subject) { // This is a read-write association end - QM_D(QUmlUseCase); - if (d->subject.contains(subject)) { - d->subject.remove(subject); + if (_subject.contains(subject)) { + _subject.remove(subject); } } diff --git a/src/uml/qumlusecase.h b/src/uml/qumlusecase.h index e72839e3..93f7c6df 100644 --- a/src/uml/qumlusecase.h +++ b/src/uml/qumlusecase.h @@ -56,11 +56,10 @@ class QUmlExtend; class QUmlExtensionPoint; class QUmlInclude; -class QUmlUseCasePrivate; class Q_UML_EXPORT QUmlUseCase : public QUmlBehavioredClassifier { public: - QUmlUseCase(bool create_d_ptr = true); + QUmlUseCase(); // Owned attributes QSet<QUmlExtend *> extend() const; @@ -78,6 +77,12 @@ public: // Operations QSet<QUmlUseCase *> allIncludedUseCases() const; + +protected: + QSet<QUmlExtend *> _extend; + QSet<QUmlExtensionPoint *> _extensionPoint; + QSet<QUmlInclude *> _include; + QSet<QUmlClassifier *> _subject; }; QT_END_NAMESPACE diff --git a/src/uml/qumlusecase_p.h b/src/uml/qumlusecase_p.h deleted file mode 100644 index 96d50114..00000000 --- a/src/uml/qumlusecase_p.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLUSECASE_P_H -#define QUMLUSECASE_P_H - -#include "QtUml/QUmlUseCase" - -#include "private/qumlbehavioredclassifier_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlUseCasePrivate : public QUmlBehavioredClassifierPrivate -{ -public: - QUmlUseCasePrivate(); - - QSet<QUmlExtend *> extend; - QSet<QUmlExtensionPoint *> extensionPoint; - QSet<QUmlInclude *> include; - QSet<QUmlClassifier *> subject; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLUSECASE_P_H - diff --git a/src/uml/qumlvaluepin.cpp b/src/uml/qumlvaluepin.cpp index a65a91d3..98b7a41f 100644 --- a/src/uml/qumlvaluepin.cpp +++ b/src/uml/qumlvaluepin.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlvaluepin.h" -#include "qumlvaluepin_p.h" #include <QtUml/QUmlValueSpecification> QT_BEGIN_NAMESPACE -QUmlValuePinPrivate::QUmlValuePinPrivate() : - value(0) -{ -} - /*! \class QUmlValuePin @@ -58,11 +52,9 @@ QUmlValuePinPrivate::QUmlValuePinPrivate() : \brief A value pin is an input pin that provides a value by evaluating a value specification. */ -QUmlValuePin::QUmlValuePin(bool create_d_ptr) : - QUmlInputPin(false) +QUmlValuePin::QUmlValuePin() : + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlValuePinPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlValueSpecification *QUmlValuePin::value() const { // This is a read-write association end - QM_D(const QUmlValuePin); - return d->value; + return _value; } void QUmlValuePin::setValue(QUmlValueSpecification *value) { // This is a read-write association end - QM_D(QUmlValuePin); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlvaluepin.h b/src/uml/qumlvaluepin.h index 0da985f8..ce1b8d74 100644 --- a/src/uml/qumlvaluepin.h +++ b/src/uml/qumlvaluepin.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlValueSpecification; -class QUmlValuePinPrivate; class Q_UML_EXPORT QUmlValuePin : public QUmlInputPin { public: - QUmlValuePin(bool create_d_ptr = true); + QUmlValuePin(); // Owned attributes QUmlValueSpecification *value() const; void setValue(QUmlValueSpecification *value); + +protected: + QUmlValueSpecification *_value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlvaluepin_p.h b/src/uml/qumlvaluepin_p.h deleted file mode 100644 index 24bcca0f..00000000 --- a/src/uml/qumlvaluepin_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLVALUEPIN_P_H -#define QUMLVALUEPIN_P_H - -#include "QtUml/QUmlValuePin" - -#include "private/qumlinputpin_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlValuePinPrivate : public QUmlInputPinPrivate -{ -public: - QUmlValuePinPrivate(); - - QUmlValueSpecification *value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLVALUEPIN_P_H - diff --git a/src/uml/qumlvaluespecification.cpp b/src/uml/qumlvaluespecification.cpp index 131f7fec..3706e5c7 100644 --- a/src/uml/qumlvaluespecification.cpp +++ b/src/uml/qumlvaluespecification.cpp @@ -39,16 +39,11 @@ ** ****************************************************************************/ #include "qumlvaluespecification.h" -#include "qumlvaluespecification_p.h" #include <QtUml/QUmlParameterableElement> QT_BEGIN_NAMESPACE -QUmlValueSpecificationPrivate::QUmlValueSpecificationPrivate() -{ -} - /*! \class QUmlValueSpecification @@ -57,12 +52,8 @@ QUmlValueSpecificationPrivate::QUmlValueSpecificationPrivate() \brief ValueSpecification specializes ParameterableElement to specify that a value specification can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template.A value specification is the specification of a (possibly empty) set of instances, including both objects and data values. */ -QUmlValueSpecification::QUmlValueSpecification(bool create_d_ptr) : - QUmlTypedElement(false), - QUmlPackageableElement(false) +QUmlValueSpecification::QUmlValueSpecification() { - if (create_d_ptr) - set_d_ptr(new QUmlValueSpecificationPrivate); } // OPERATIONS diff --git a/src/uml/qumlvaluespecification.h b/src/uml/qumlvaluespecification.h index 9881d16d..4b05b2e1 100644 --- a/src/uml/qumlvaluespecification.h +++ b/src/uml/qumlvaluespecification.h @@ -54,11 +54,10 @@ QT_MODULE(QtUml) class QUmlParameterableElement; -class QUmlValueSpecificationPrivate; class Q_UML_EXPORT QUmlValueSpecification : public QUmlTypedElement, public QUmlPackageableElement { public: - Q_DECL_HIDDEN QUmlValueSpecification(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlValueSpecification(); // Operations bool booleanValue() const; @@ -69,6 +68,8 @@ public: double realValue() const; QString stringValue() const; int unlimitedValue() const; + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlvaluespecification_p.h b/src/uml/qumlvaluespecification_p.h deleted file mode 100644 index 003da4cf..00000000 --- a/src/uml/qumlvaluespecification_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLVALUESPECIFICATION_P_H -#define QUMLVALUESPECIFICATION_P_H - -#include "QtUml/QUmlValueSpecification" - -#include "private/qumltypedelement_p.h" -#include "private/qumlpackageableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlValueSpecificationPrivate : public QUmlTypedElementPrivate, public QUmlPackageableElementPrivate -{ -public: - QUmlValueSpecificationPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLVALUESPECIFICATION_P_H - diff --git a/src/uml/qumlvaluespecificationaction.cpp b/src/uml/qumlvaluespecificationaction.cpp index 7ef0f57b..3b81f011 100644 --- a/src/uml/qumlvaluespecificationaction.cpp +++ b/src/uml/qumlvaluespecificationaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlvaluespecificationaction.h" -#include "qumlvaluespecificationaction_p.h" #include <QtUml/QUmlOutputPin> #include <QtUml/QUmlValueSpecification> QT_BEGIN_NAMESPACE -QUmlValueSpecificationActionPrivate::QUmlValueSpecificationActionPrivate() : - result(0), - value(0) -{ -} - /*! \class QUmlValueSpecificationAction @@ -60,11 +53,10 @@ QUmlValueSpecificationActionPrivate::QUmlValueSpecificationActionPrivate() : \brief A value specification action is an action that evaluates a value specification. */ -QUmlValueSpecificationAction::QUmlValueSpecificationAction(bool create_d_ptr) : - QUmlAction(false) +QUmlValueSpecificationAction::QUmlValueSpecificationAction() : + _result(0), + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlValueSpecificationActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlOutputPin *QUmlValueSpecificationAction::result() const { // This is a read-write association end - QM_D(const QUmlValueSpecificationAction); - return d->result; + return _result; } void QUmlValueSpecificationAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlValueSpecificationAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } @@ -97,17 +87,15 @@ QUmlValueSpecification *QUmlValueSpecificationAction::value() const { // This is a read-write association end - QM_D(const QUmlValueSpecificationAction); - return d->value; + return _value; } void QUmlValueSpecificationAction::setValue(QUmlValueSpecification *value) { // This is a read-write association end - QM_D(QUmlValueSpecificationAction); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlvaluespecificationaction.h b/src/uml/qumlvaluespecificationaction.h index 6162e17d..9fe43a38 100644 --- a/src/uml/qumlvaluespecificationaction.h +++ b/src/uml/qumlvaluespecificationaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlOutputPin; class QUmlValueSpecification; -class QUmlValueSpecificationActionPrivate; class Q_UML_EXPORT QUmlValueSpecificationAction : public QUmlAction { public: - QUmlValueSpecificationAction(bool create_d_ptr = true); + QUmlValueSpecificationAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); QUmlValueSpecification *value() const; void setValue(QUmlValueSpecification *value); + +protected: + QUmlOutputPin *_result; + QUmlValueSpecification *_value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlvaluespecificationaction_p.h b/src/uml/qumlvaluespecificationaction_p.h deleted file mode 100644 index 1a0e1d95..00000000 --- a/src/uml/qumlvaluespecificationaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLVALUESPECIFICATIONACTION_P_H -#define QUMLVALUESPECIFICATIONACTION_P_H - -#include "QtUml/QUmlValueSpecificationAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlValueSpecificationActionPrivate : public QUmlActionPrivate -{ -public: - QUmlValueSpecificationActionPrivate(); - - QUmlOutputPin *result; - QUmlValueSpecification *value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLVALUESPECIFICATIONACTION_P_H - diff --git a/src/uml/qumlvariable.cpp b/src/uml/qumlvariable.cpp index 35dd8480..32b2619d 100644 --- a/src/uml/qumlvariable.cpp +++ b/src/uml/qumlvariable.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlvariable.h" -#include "qumlvariable_p.h" #include <QtUml/QUmlAction> #include <QtUml/QUmlActivity> @@ -47,12 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlVariablePrivate::QUmlVariablePrivate() : - activityScope(0), - scope(0) -{ -} - /*! \class QUmlVariable @@ -61,12 +54,10 @@ QUmlVariablePrivate::QUmlVariablePrivate() : \brief A variable is considered a connectable element.Variables are elements for passing data between actions indirectly. A local variable stores values shared by the actions within a structured activity group but not accessible outside it. The output of an action may be written to a variable and read for the input to a subsequent action, which is effectively an indirect data flow path. Because there is no predefined relationship between actions that read and write variables, these actions must be sequenced by control flows to prevent race conditions that may occur between actions that read or write the same variable. */ -QUmlVariable::QUmlVariable(bool create_d_ptr) : - QUmlMultiplicityElement(false), - QUmlConnectableElement(false) +QUmlVariable::QUmlVariable() : + _activityScope(0), + _scope(0) { - if (create_d_ptr) - set_d_ptr(new QUmlVariablePrivate); } // OWNED ATTRIBUTES @@ -78,17 +69,15 @@ QUmlActivity *QUmlVariable::activityScope() const { // This is a read-write association end - QM_D(const QUmlVariable); - return d->activityScope; + return _activityScope; } void QUmlVariable::setActivityScope(QUmlActivity *activityScope) { // This is a read-write association end - QM_D(QUmlVariable); - if (d->activityScope != activityScope) { - d->activityScope = activityScope; + if (_activityScope != activityScope) { + _activityScope = activityScope; } } @@ -99,17 +88,15 @@ QUmlStructuredActivityNode *QUmlVariable::scope() const { // This is a read-write association end - QM_D(const QUmlVariable); - return d->scope; + return _scope; } void QUmlVariable::setScope(QUmlStructuredActivityNode *scope) { // This is a read-write association end - QM_D(QUmlVariable); - if (d->scope != scope) { - d->scope = scope; + if (_scope != scope) { + _scope = scope; } } diff --git a/src/uml/qumlvariable.h b/src/uml/qumlvariable.h index 21734dc0..48d240fb 100644 --- a/src/uml/qumlvariable.h +++ b/src/uml/qumlvariable.h @@ -56,11 +56,10 @@ class QUmlAction; class QUmlActivity; class QUmlStructuredActivityNode; -class QUmlVariablePrivate; class Q_UML_EXPORT QUmlVariable : public QUmlMultiplicityElement, public QUmlConnectableElement { public: - QUmlVariable(bool create_d_ptr = true); + QUmlVariable(); // Owned attributes QUmlActivity *activityScope() const; @@ -70,6 +69,10 @@ public: // Operations bool isAccessibleBy(QUmlAction *a) const; + +protected: + QUmlActivity *_activityScope; + QUmlStructuredActivityNode *_scope; }; QT_END_NAMESPACE diff --git a/src/uml/qumlvariable_p.h b/src/uml/qumlvariable_p.h deleted file mode 100644 index 28a0af87..00000000 --- a/src/uml/qumlvariable_p.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLVARIABLE_P_H -#define QUMLVARIABLE_P_H - -#include "QtUml/QUmlVariable" - -#include "private/qumlmultiplicityelement_p.h" -#include "private/qumlconnectableelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlVariablePrivate : public QUmlMultiplicityElementPrivate, public QUmlConnectableElementPrivate -{ -public: - QUmlVariablePrivate(); - - QUmlActivity *activityScope; - QUmlStructuredActivityNode *scope; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLVARIABLE_P_H - diff --git a/src/uml/qumlvariableaction.cpp b/src/uml/qumlvariableaction.cpp index f75d632b..beda0a4c 100644 --- a/src/uml/qumlvariableaction.cpp +++ b/src/uml/qumlvariableaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlvariableaction.h" -#include "qumlvariableaction_p.h" #include <QtUml/QUmlVariable> QT_BEGIN_NAMESPACE -QUmlVariableActionPrivate::QUmlVariableActionPrivate() : - variable(0) -{ -} - /*! \class QUmlVariableAction @@ -58,11 +52,9 @@ QUmlVariableActionPrivate::QUmlVariableActionPrivate() : \brief VariableAction is an abstract class for actions that operate on a statically specified variable. */ -QUmlVariableAction::QUmlVariableAction(bool create_d_ptr) : - QUmlAction(false) +QUmlVariableAction::QUmlVariableAction() : + _variable(0) { - if (create_d_ptr) - set_d_ptr(new QUmlVariableActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlVariable *QUmlVariableAction::variable() const { // This is a read-write association end - QM_D(const QUmlVariableAction); - return d->variable; + return _variable; } void QUmlVariableAction::setVariable(QUmlVariable *variable) { // This is a read-write association end - QM_D(QUmlVariableAction); - if (d->variable != variable) { - d->variable = variable; + if (_variable != variable) { + _variable = variable; } } diff --git a/src/uml/qumlvariableaction.h b/src/uml/qumlvariableaction.h index ebbefbcb..3a31bff0 100644 --- a/src/uml/qumlvariableaction.h +++ b/src/uml/qumlvariableaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlVariable; -class QUmlVariableActionPrivate; class Q_UML_EXPORT QUmlVariableAction : public QUmlAction { public: - Q_DECL_HIDDEN QUmlVariableAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlVariableAction(); // Owned attributes QUmlVariable *variable() const; void setVariable(QUmlVariable *variable); + +protected: + QUmlVariable *_variable; }; QT_END_NAMESPACE diff --git a/src/uml/qumlvariableaction_p.h b/src/uml/qumlvariableaction_p.h deleted file mode 100644 index 67d75ad8..00000000 --- a/src/uml/qumlvariableaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLVARIABLEACTION_P_H -#define QUMLVARIABLEACTION_P_H - -#include "QtUml/QUmlVariableAction" - -#include "private/qumlaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlVariableActionPrivate : public QUmlActionPrivate -{ -public: - QUmlVariableActionPrivate(); - - QUmlVariable *variable; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLVARIABLEACTION_P_H - diff --git a/src/uml/qumlvertex.cpp b/src/uml/qumlvertex.cpp index 38c01bd5..3764217f 100644 --- a/src/uml/qumlvertex.cpp +++ b/src/uml/qumlvertex.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ #include "qumlvertex.h" -#include "qumlvertex_p.h" #include <QtUml/QUmlRegion> #include <QtUml/QUmlStateMachine> @@ -47,11 +46,6 @@ QT_BEGIN_NAMESPACE -QUmlVertexPrivate::QUmlVertexPrivate() : - container(0) -{ -} - /*! \class QUmlVertex @@ -60,11 +54,9 @@ QUmlVertexPrivate::QUmlVertexPrivate() : \brief A vertex is an abstraction of a node in a state machine graph. In general, it can be the source or destination of any number of transitions. */ -QUmlVertex::QUmlVertex(bool create_d_ptr) : - QUmlNamedElement(false) +QUmlVertex::QUmlVertex() : + _container(0) { - if (create_d_ptr) - set_d_ptr(new QUmlVertexPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlRegion *QUmlVertex::container() const { // This is a read-write association end - QM_D(const QUmlVertex); - return d->container; + return _container; } void QUmlVertex::setContainer(QUmlRegion *container) { // This is a read-write association end - QM_D(QUmlVertex); - if (d->container != container) { - d->container = container; + if (_container != container) { + _container = container; } } diff --git a/src/uml/qumlvertex.h b/src/uml/qumlvertex.h index 96585e7b..993eccca 100644 --- a/src/uml/qumlvertex.h +++ b/src/uml/qumlvertex.h @@ -55,11 +55,10 @@ class QUmlRegion; class QUmlStateMachine; class QUmlTransition; -class QUmlVertexPrivate; class Q_UML_EXPORT QUmlVertex : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN QUmlVertex(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlVertex(); // Owned attributes QUmlRegion *container() const; @@ -69,6 +68,9 @@ public: // Operations QUmlStateMachine *containingStateMachine() const; + +protected: + QUmlRegion *_container; }; QT_END_NAMESPACE diff --git a/src/uml/qumlvertex_p.h b/src/uml/qumlvertex_p.h deleted file mode 100644 index 73590322..00000000 --- a/src/uml/qumlvertex_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLVERTEX_P_H -#define QUMLVERTEX_P_H - -#include "QtUml/QUmlVertex" - -#include "private/qumlnamedelement_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlVertexPrivate : public virtual QUmlNamedElementPrivate -{ -public: - QUmlVertexPrivate(); - - QUmlRegion *container; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLVERTEX_P_H - diff --git a/src/uml/qumlwritelinkaction.cpp b/src/uml/qumlwritelinkaction.cpp index 38a94af6..89150790 100644 --- a/src/uml/qumlwritelinkaction.cpp +++ b/src/uml/qumlwritelinkaction.cpp @@ -39,14 +39,9 @@ ** ****************************************************************************/ #include "qumlwritelinkaction.h" -#include "qumlwritelinkaction_p.h" QT_BEGIN_NAMESPACE -QUmlWriteLinkActionPrivate::QUmlWriteLinkActionPrivate() -{ -} - /*! \class QUmlWriteLinkAction @@ -55,11 +50,8 @@ QUmlWriteLinkActionPrivate::QUmlWriteLinkActionPrivate() \brief WriteLinkAction is an abstract class for link actions that create and destroy links. */ -QUmlWriteLinkAction::QUmlWriteLinkAction(bool create_d_ptr) : - QUmlLinkAction(false) +QUmlWriteLinkAction::QUmlWriteLinkAction() { - if (create_d_ptr) - set_d_ptr(new QUmlWriteLinkActionPrivate); } QT_END_NAMESPACE diff --git a/src/uml/qumlwritelinkaction.h b/src/uml/qumlwritelinkaction.h index 738b2e15..d3c59c1c 100644 --- a/src/uml/qumlwritelinkaction.h +++ b/src/uml/qumlwritelinkaction.h @@ -51,11 +51,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class QUmlWriteLinkActionPrivate; class Q_UML_EXPORT QUmlWriteLinkAction : public QUmlLinkAction { public: - Q_DECL_HIDDEN QUmlWriteLinkAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlWriteLinkAction(); + +protected: }; QT_END_NAMESPACE diff --git a/src/uml/qumlwritelinkaction_p.h b/src/uml/qumlwritelinkaction_p.h deleted file mode 100644 index 9d2243b5..00000000 --- a/src/uml/qumlwritelinkaction_p.h +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLWRITELINKACTION_P_H -#define QUMLWRITELINKACTION_P_H - -#include "QtUml/QUmlWriteLinkAction" - -#include "private/qumllinkaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlWriteLinkActionPrivate : public QUmlLinkActionPrivate -{ -public: - QUmlWriteLinkActionPrivate(); - -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLWRITELINKACTION_P_H - diff --git a/src/uml/qumlwritestructuralfeatureaction.cpp b/src/uml/qumlwritestructuralfeatureaction.cpp index f7c51652..280f0a1d 100644 --- a/src/uml/qumlwritestructuralfeatureaction.cpp +++ b/src/uml/qumlwritestructuralfeatureaction.cpp @@ -39,19 +39,12 @@ ** ****************************************************************************/ #include "qumlwritestructuralfeatureaction.h" -#include "qumlwritestructuralfeatureaction_p.h" #include <QtUml/QUmlInputPin> #include <QtUml/QUmlOutputPin> QT_BEGIN_NAMESPACE -QUmlWriteStructuralFeatureActionPrivate::QUmlWriteStructuralFeatureActionPrivate() : - result(0), - value(0) -{ -} - /*! \class QUmlWriteStructuralFeatureAction @@ -60,11 +53,10 @@ QUmlWriteStructuralFeatureActionPrivate::QUmlWriteStructuralFeatureActionPrivate \brief WriteStructuralFeatureAction is an abstract class for structural feature actions that change structural feature values. */ -QUmlWriteStructuralFeatureAction::QUmlWriteStructuralFeatureAction(bool create_d_ptr) : - QUmlStructuralFeatureAction(false) +QUmlWriteStructuralFeatureAction::QUmlWriteStructuralFeatureAction() : + _result(0), + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlWriteStructuralFeatureActionPrivate); } // OWNED ATTRIBUTES @@ -76,17 +68,15 @@ QUmlOutputPin *QUmlWriteStructuralFeatureAction::result() const { // This is a read-write association end - QM_D(const QUmlWriteStructuralFeatureAction); - return d->result; + return _result; } void QUmlWriteStructuralFeatureAction::setResult(QUmlOutputPin *result) { // This is a read-write association end - QM_D(QUmlWriteStructuralFeatureAction); - if (d->result != result) { - d->result = result; + if (_result != result) { + _result = result; } } @@ -97,17 +87,15 @@ QUmlInputPin *QUmlWriteStructuralFeatureAction::value() const { // This is a read-write association end - QM_D(const QUmlWriteStructuralFeatureAction); - return d->value; + return _value; } void QUmlWriteStructuralFeatureAction::setValue(QUmlInputPin *value) { // This is a read-write association end - QM_D(QUmlWriteStructuralFeatureAction); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlwritestructuralfeatureaction.h b/src/uml/qumlwritestructuralfeatureaction.h index d1a4983c..bd7e5121 100644 --- a/src/uml/qumlwritestructuralfeatureaction.h +++ b/src/uml/qumlwritestructuralfeatureaction.h @@ -54,17 +54,20 @@ QT_MODULE(QtUml) class QUmlInputPin; class QUmlOutputPin; -class QUmlWriteStructuralFeatureActionPrivate; class Q_UML_EXPORT QUmlWriteStructuralFeatureAction : public QUmlStructuralFeatureAction { public: - Q_DECL_HIDDEN QUmlWriteStructuralFeatureAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlWriteStructuralFeatureAction(); // Owned attributes QUmlOutputPin *result() const; void setResult(QUmlOutputPin *result); QUmlInputPin *value() const; void setValue(QUmlInputPin *value); + +protected: + QUmlOutputPin *_result; + QUmlInputPin *_value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlwritestructuralfeatureaction_p.h b/src/uml/qumlwritestructuralfeatureaction_p.h deleted file mode 100644 index ffcb4b42..00000000 --- a/src/uml/qumlwritestructuralfeatureaction_p.h +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLWRITESTRUCTURALFEATUREACTION_P_H -#define QUMLWRITESTRUCTURALFEATUREACTION_P_H - -#include "QtUml/QUmlWriteStructuralFeatureAction" - -#include "private/qumlstructuralfeatureaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlWriteStructuralFeatureActionPrivate : public QUmlStructuralFeatureActionPrivate -{ -public: - QUmlWriteStructuralFeatureActionPrivate(); - - QUmlOutputPin *result; - QUmlInputPin *value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLWRITESTRUCTURALFEATUREACTION_P_H - diff --git a/src/uml/qumlwritevariableaction.cpp b/src/uml/qumlwritevariableaction.cpp index 7828145c..20ac6959 100644 --- a/src/uml/qumlwritevariableaction.cpp +++ b/src/uml/qumlwritevariableaction.cpp @@ -39,17 +39,11 @@ ** ****************************************************************************/ #include "qumlwritevariableaction.h" -#include "qumlwritevariableaction_p.h" #include <QtUml/QUmlInputPin> QT_BEGIN_NAMESPACE -QUmlWriteVariableActionPrivate::QUmlWriteVariableActionPrivate() : - value(0) -{ -} - /*! \class QUmlWriteVariableAction @@ -58,11 +52,9 @@ QUmlWriteVariableActionPrivate::QUmlWriteVariableActionPrivate() : \brief WriteVariableAction is an abstract class for variable actions that change variable values. */ -QUmlWriteVariableAction::QUmlWriteVariableAction(bool create_d_ptr) : - QUmlVariableAction(false) +QUmlWriteVariableAction::QUmlWriteVariableAction() : + _value(0) { - if (create_d_ptr) - set_d_ptr(new QUmlWriteVariableActionPrivate); } // OWNED ATTRIBUTES @@ -74,17 +66,15 @@ QUmlInputPin *QUmlWriteVariableAction::value() const { // This is a read-write association end - QM_D(const QUmlWriteVariableAction); - return d->value; + return _value; } void QUmlWriteVariableAction::setValue(QUmlInputPin *value) { // This is a read-write association end - QM_D(QUmlWriteVariableAction); - if (d->value != value) { - d->value = value; + if (_value != value) { + _value = value; } } diff --git a/src/uml/qumlwritevariableaction.h b/src/uml/qumlwritevariableaction.h index 6f29abcf..ad51e7f4 100644 --- a/src/uml/qumlwritevariableaction.h +++ b/src/uml/qumlwritevariableaction.h @@ -53,15 +53,17 @@ QT_MODULE(QtUml) class QUmlInputPin; -class QUmlWriteVariableActionPrivate; class Q_UML_EXPORT QUmlWriteVariableAction : public QUmlVariableAction { public: - Q_DECL_HIDDEN QUmlWriteVariableAction(bool create_d_ptr = true); + Q_DECL_HIDDEN QUmlWriteVariableAction(); // Owned attributes QUmlInputPin *value() const; void setValue(QUmlInputPin *value); + +protected: + QUmlInputPin *_value; }; QT_END_NAMESPACE diff --git a/src/uml/qumlwritevariableaction_p.h b/src/uml/qumlwritevariableaction_p.h deleted file mode 100644 index c796d872..00000000 --- a/src/uml/qumlwritevariableaction_p.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Sandro S. Andrade <sandroandrade@kde.org> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtUml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QUMLWRITEVARIABLEACTION_P_H -#define QUMLWRITEVARIABLEACTION_P_H - -#include "QtUml/QUmlWriteVariableAction" - -#include "private/qumlvariableaction_p.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(QtUml) - -class Q_UML_EXPORT QUmlWriteVariableActionPrivate : public QUmlVariableActionPrivate -{ -public: - QUmlWriteVariableActionPrivate(); - - QUmlInputPin *value; -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QUMLWRITEVARIABLEACTION_P_H - diff --git a/src/uml/uml.pri b/src/uml/uml.pri index 00102283..6a5d061f 100644 --- a/src/uml/uml.pri +++ b/src/uml/uml.pri @@ -1,4 +1,4 @@ -PUBLIC_HEADERS += \ +HEADERS += \ qtumlglobal.h \ qtumlnamespace.h \ qumlabstraction.h \ @@ -244,250 +244,6 @@ PUBLIC_HEADERS += \ qumlwritestructuralfeatureaction.h \ qumlwritevariableaction.h -PRIVATE_HEADERS += \ - qumlabstraction_p.h \ - qumlacceptcallaction_p.h \ - qumlaccepteventaction_p.h \ - qumlaction_p.h \ - qumlactionexecutionspecification_p.h \ - qumlactioninputpin_p.h \ - qumlactivity_p.h \ - qumlactivityedge_p.h \ - qumlactivityfinalnode_p.h \ - qumlactivitygroup_p.h \ - qumlactivitynode_p.h \ - qumlactivityparameternode_p.h \ - qumlactivitypartition_p.h \ - qumlactor_p.h \ - qumladdstructuralfeaturevalueaction_p.h \ - qumladdvariablevalueaction_p.h \ - qumlanyreceiveevent_p.h \ - qumlartifact_p.h \ - qumlassociation_p.h \ - qumlassociationclass_p.h \ - qumlbehavior_p.h \ - qumlbehaviorexecutionspecification_p.h \ - qumlbehavioralfeature_p.h \ - qumlbehavioredclassifier_p.h \ - qumlbroadcastsignalaction_p.h \ - qumlcallaction_p.h \ - qumlcallbehavioraction_p.h \ - qumlcallevent_p.h \ - qumlcalloperationaction_p.h \ - qumlcentralbuffernode_p.h \ - qumlchangeevent_p.h \ - qumlclass_p.h \ - qumlclassifier_p.h \ - qumlclassifiertemplateparameter_p.h \ - qumlclause_p.h \ - qumlclearassociationaction_p.h \ - qumlclearstructuralfeatureaction_p.h \ - qumlclearvariableaction_p.h \ - qumlcollaboration_p.h \ - qumlcollaborationuse_p.h \ - qumlcombinedfragment_p.h \ - qumlcomment_p.h \ - qumlcommunicationpath_p.h \ - qumlcomponent_p.h \ - qumlcomponentrealization_p.h \ - qumlconditionalnode_p.h \ - qumlconnectableelement_p.h \ - qumlconnectableelementtemplateparameter_p.h \ - qumlconnectionpointreference_p.h \ - qumlconnector_p.h \ - qumlconnectorend_p.h \ - qumlconsiderignorefragment_p.h \ - qumlconstraint_p.h \ - qumlcontinuation_p.h \ - qumlcontrolflow_p.h \ - qumlcontrolnode_p.h \ - qumlcreatelinkaction_p.h \ - qumlcreatelinkobjectaction_p.h \ - qumlcreateobjectaction_p.h \ - qumldatastorenode_p.h \ - qumldatatype_p.h \ - qumldecisionnode_p.h \ - qumldependency_p.h \ - qumldeployedartifact_p.h \ - qumldeployment_p.h \ - qumldeploymentspecification_p.h \ - qumldeploymenttarget_p.h \ - qumldestroylinkaction_p.h \ - qumldestroyobjectaction_p.h \ - qumldestructionoccurrencespecification_p.h \ - qumldevice_p.h \ - qumldirectedrelationship_p.h \ - qumlduration_p.h \ - qumldurationconstraint_p.h \ - qumldurationinterval_p.h \ - qumldurationobservation_p.h \ - qumlelement_p.h \ - qumlelementimport_p.h \ - qumlencapsulatedclassifier_p.h \ - qumlenumeration_p.h \ - qumlenumerationliteral_p.h \ - qumlevent_p.h \ - qumlexceptionhandler_p.h \ - qumlexecutablenode_p.h \ - qumlexecutionenvironment_p.h \ - qumlexecutionoccurrencespecification_p.h \ - qumlexecutionspecification_p.h \ - qumlexpansionnode_p.h \ - qumlexpansionregion_p.h \ - qumlexpression_p.h \ - qumlextend_p.h \ - qumlextension_p.h \ - qumlextensionend_p.h \ - qumlextensionpoint_p.h \ - qumlfeature_p.h \ - qumlfinalnode_p.h \ - qumlfinalstate_p.h \ - qumlflowfinalnode_p.h \ - qumlforknode_p.h \ - qumlfunctionbehavior_p.h \ - qumlgate_p.h \ - qumlgeneralordering_p.h \ - qumlgeneralization_p.h \ - qumlgeneralizationset_p.h \ - qumlimage_p.h \ - qumlinclude_p.h \ - qumlinformationflow_p.h \ - qumlinformationitem_p.h \ - qumlinitialnode_p.h \ - qumlinputpin_p.h \ - qumlinstancespecification_p.h \ - qumlinstancevalue_p.h \ - qumlinteraction_p.h \ - qumlinteractionconstraint_p.h \ - qumlinteractionfragment_p.h \ - qumlinteractionoperand_p.h \ - qumlinteractionuse_p.h \ - qumlinterface_p.h \ - qumlinterfacerealization_p.h \ - qumlinterruptibleactivityregion_p.h \ - qumlinterval_p.h \ - qumlintervalconstraint_p.h \ - qumlinvocationaction_p.h \ - qumljoinnode_p.h \ - qumllifeline_p.h \ - qumllinkaction_p.h \ - qumllinkendcreationdata_p.h \ - qumllinkenddata_p.h \ - qumllinkenddestructiondata_p.h \ - qumlliteralboolean_p.h \ - qumlliteralinteger_p.h \ - qumlliteralnull_p.h \ - qumlliteralreal_p.h \ - qumlliteralspecification_p.h \ - qumlliteralstring_p.h \ - qumlliteralunlimitednatural_p.h \ - qumlloopnode_p.h \ - qumlmanifestation_p.h \ - qumlmergenode_p.h \ - qumlmessage_p.h \ - qumlmessageend_p.h \ - qumlmessageevent_p.h \ - qumlmessageoccurrencespecification_p.h \ - qumlmodel_p.h \ - qumlmultiplicityelement_p.h \ - qumlnamedelement_p.h \ - qumlnamespace_p.h \ - qumlnode_p.h \ - qumlobjectflow_p.h \ - qumlobjectnode_p.h \ - qumlobservation_p.h \ - qumloccurrencespecification_p.h \ - qumlopaqueaction_p.h \ - qumlopaquebehavior_p.h \ - qumlopaqueexpression_p.h \ - qumloperation_p.h \ - qumloperationtemplateparameter_p.h \ - qumloutputpin_p.h \ - qumlpackage_p.h \ - qumlpackageimport_p.h \ - qumlpackagemerge_p.h \ - qumlpackageableelement_p.h \ - qumlparameter_p.h \ - qumlparameterset_p.h \ - qumlparameterableelement_p.h \ - qumlpartdecomposition_p.h \ - qumlpin_p.h \ - qumlport_p.h \ - qumlprimitivetype_p.h \ - qumlprofile_p.h \ - qumlprofileapplication_p.h \ - qumlproperty_p.h \ - qumlprotocolconformance_p.h \ - qumlprotocolstatemachine_p.h \ - qumlprotocoltransition_p.h \ - qumlpseudostate_p.h \ - qumlqualifiervalue_p.h \ - qumlraiseexceptionaction_p.h \ - qumlreadextentaction_p.h \ - qumlreadisclassifiedobjectaction_p.h \ - qumlreadlinkaction_p.h \ - qumlreadlinkobjectendaction_p.h \ - qumlreadlinkobjectendqualifieraction_p.h \ - qumlreadselfaction_p.h \ - qumlreadstructuralfeatureaction_p.h \ - qumlreadvariableaction_p.h \ - qumlrealization_p.h \ - qumlreception_p.h \ - qumlreclassifyobjectaction_p.h \ - qumlredefinableelement_p.h \ - qumlredefinabletemplatesignature_p.h \ - qumlreduceaction_p.h \ - qumlregion_p.h \ - qumlrelationship_p.h \ - qumlremovestructuralfeaturevalueaction_p.h \ - qumlremovevariablevalueaction_p.h \ - qumlreplyaction_p.h \ - qumlsendobjectaction_p.h \ - qumlsendsignalaction_p.h \ - qumlsequencenode_p.h \ - qumlsignal_p.h \ - qumlsignalevent_p.h \ - qumlslot_p.h \ - qumlstartclassifierbehavioraction_p.h \ - qumlstartobjectbehavioraction_p.h \ - qumlstate_p.h \ - qumlstateinvariant_p.h \ - qumlstatemachine_p.h \ - qumlstereotype_p.h \ - qumlstringexpression_p.h \ - qumlstructuralfeature_p.h \ - qumlstructuralfeatureaction_p.h \ - qumlstructuredactivitynode_p.h \ - qumlstructuredclassifier_p.h \ - qumlsubstitution_p.h \ - qumltemplatebinding_p.h \ - qumltemplateparameter_p.h \ - qumltemplateparametersubstitution_p.h \ - qumltemplatesignature_p.h \ - qumltemplateableelement_p.h \ - qumltestidentityaction_p.h \ - qumltimeconstraint_p.h \ - qumltimeevent_p.h \ - qumltimeexpression_p.h \ - qumltimeinterval_p.h \ - qumltimeobservation_p.h \ - qumltransition_p.h \ - qumltrigger_p.h \ - qumltype_p.h \ - qumltypedelement_p.h \ - qumlunmarshallaction_p.h \ - qumlusage_p.h \ - qumlusecase_p.h \ - qumlvaluepin_p.h \ - qumlvaluespecification_p.h \ - qumlvaluespecificationaction_p.h \ - qumlvariable_p.h \ - qumlvariableaction_p.h \ - qumlvertex_p.h \ - qumlwritelinkaction_p.h \ - qumlwritestructuralfeatureaction_p.h \ - qumlwritevariableaction_p.h - SOURCES += \ qtumlnamespace.cpp \ qumlabstraction.cpp \ diff --git a/src/uml/uml.pro b/src/uml/uml.pro index 28d11ef5..00372a69 100644 --- a/src/uml/uml.pro +++ b/src/uml/uml.pro @@ -8,5 +8,3 @@ QMAKE_DOCS = $$PWD/doc/qtuml.qdocconf load(qt_module) include(uml.pri) - -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
\ No newline at end of file |