diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-10-13 23:19:00 -0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-14 15:03:23 +0200 |
| commit | b715a4573294771118213d866d70b947bade715b (patch) | |
| tree | 30036c525d96c5feb20e209e4e4b988ecca5f151 | |
| parent | 2dbf082f802705c430832848abc73b792697c441 (diff) | |
Update automatic generation of UML metamodel implementation
Change-Id: I4a2ae9cdcde86c33669e2e56cec651e7bce3e629
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
223 files changed, 286 insertions, 461 deletions
diff --git a/scripts/templates/modulenamespace.h b/scripts/templates/modulenamespace.h index 63f94356..e3d17e15 100644 --- a/scripts/templates/modulenamespace.h +++ b/scripts/templates/modulenamespace.h @@ -78,10 +78,6 @@ public: QT_END_NAMESPACE -[%- FOREACH enumeration IN enumerations %] -Q_DECLARE_METATYPE(Qt${namespace}::${enumeration.findvalue("@name")}) -[%- END %] - QT_END_HEADER #endif // QT${namespace.upper}NAMESPACE_H diff --git a/src/modeling/qmodelingelement.h b/src/modeling/qmodelingelement.h index ed863455..139822df 100644 --- a/src/modeling/qmodelingelement.h +++ b/src/modeling/qmodelingelement.h @@ -46,6 +46,7 @@ #include <QtModeling/QModelingObject> #include <QtCore/QPointer> +#include <QtCore/QStringList> QT_BEGIN_HEADER diff --git a/src/modeling/qmodelingobject.cpp b/src/modeling/qmodelingobject.cpp index f4fa86ae..48169ee4 100644 --- a/src/modeling/qmodelingobject.cpp +++ b/src/modeling/qmodelingobject.cpp @@ -111,3 +111,5 @@ QModelingObject::QModelingObject() { } +QT_END_NAMESPACE + diff --git a/src/modeling/qmodelingobject_p.h b/src/modeling/qmodelingobject_p.h index e7155c2b..400109f3 100644 --- a/src/modeling/qmodelingobject_p.h +++ b/src/modeling/qmodelingobject_p.h @@ -44,6 +44,8 @@ #include "qtmodelingglobal.h" #include "private/qobject_p.h" +#include <QtCore/QStringList> + #define Q_DECLARE_METAPROPERTY_INFO(clazz, property, role, value) QModelingObject::propertyDataHash[QStringLiteral(#clazz)][QStringLiteral(#property)][QtModeling::role] = value; QT_BEGIN_HEADER diff --git a/src/modeling/qxmireader.cpp b/src/modeling/qxmireader.cpp index fb5045fe..67256542 100644 --- a/src/modeling/qxmireader.cpp +++ b/src/modeling/qxmireader.cpp @@ -46,6 +46,7 @@ #include <QtCore/QDir> #include <QtCore/QStack> +#include <QtCore/QJsonObject> #include <QtCore/QPluginLoader> #include <QtCore/QCoreApplication> diff --git a/src/modeling/qxmireader_p.h b/src/modeling/qxmireader_p.h index c1970dc9..100a7eb7 100644 --- a/src/modeling/qxmireader_p.h +++ b/src/modeling/qxmireader_p.h @@ -44,6 +44,7 @@ #include "qtmodelingglobal.h" #include "private/qobject_p.h" +#include <QtCore/QStringList> #include <QtCore/QXmlStreamReader> QT_BEGIN_HEADER diff --git a/src/modeling/qxmiwriter.cpp b/src/modeling/qxmiwriter.cpp index 481f407b..16a17276 100644 --- a/src/modeling/qxmiwriter.cpp +++ b/src/modeling/qxmiwriter.cpp @@ -46,6 +46,7 @@ #include <QtCore/QSet> #include <QtCore/QDir> +#include <QtCore/QJsonObject> #include <QtCore/QPluginLoader> #include <QtCore/QCoreApplication> #include <QtCore/QRegularExpression> diff --git a/src/modeling/qxmiwriter.h b/src/modeling/qxmiwriter.h index 53d4ea9c..3c60ae4b 100644 --- a/src/modeling/qxmiwriter.h +++ b/src/modeling/qxmiwriter.h @@ -72,7 +72,7 @@ public: protected: void loadPlugins(); void populateIdMap(QModelingObject *modelingObject, int index = -1); - void writeObject(QModelingObject *modelingObject, QString elementName = QStringLiteral("")); + void writeObject(QModelingObject *modelingObject, QString elementName = QString()); }; QT_END_NAMESPACE diff --git a/src/modeling/qxmiwriter_p.h b/src/modeling/qxmiwriter_p.h index 0ad26833..41efdc9c 100644 --- a/src/modeling/qxmiwriter_p.h +++ b/src/modeling/qxmiwriter_p.h @@ -44,6 +44,7 @@ #include "qtmodelingglobal.h" #include "private/qobject_p.h" +#include <QtCore/QStringList> #include <QtCore/QXmlStreamWriter> QT_BEGIN_HEADER diff --git a/src/uml/qobjects/qumlactivityobject.cpp b/src/uml/qobjects/qumlactivityobject.cpp index a14261f2..fe153f2f 100644 --- a/src/uml/qobjects/qumlactivityobject.cpp +++ b/src/uml/qobjects/qumlactivityobject.cpp @@ -716,6 +716,7 @@ bool QUmlActivityObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlActivityObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlactorobject.cpp b/src/uml/qobjects/qumlactorobject.cpp index 1d3086ef..2f10b58b 100644 --- a/src/uml/qobjects/qumlactorobject.cpp +++ b/src/uml/qobjects/qumlactorobject.cpp @@ -493,6 +493,7 @@ bool QUmlActorObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlActorObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlartifactobject.cpp b/src/uml/qobjects/qumlartifactobject.cpp index 1b7f9582..80702361 100644 --- a/src/uml/qobjects/qumlartifactobject.cpp +++ b/src/uml/qobjects/qumlartifactobject.cpp @@ -506,6 +506,7 @@ bool QUmlArtifactObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlArtifactObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlassociationclassobject.cpp b/src/uml/qobjects/qumlassociationclassobject.cpp index 233c8b82..18fe5826 100644 --- a/src/uml/qobjects/qumlassociationclassobject.cpp +++ b/src/uml/qobjects/qumlassociationclassobject.cpp @@ -632,6 +632,7 @@ bool QUmlAssociationClassObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlAssociationClassObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlassociationobject.cpp b/src/uml/qobjects/qumlassociationobject.cpp index d98dfc5c..1728df1b 100644 --- a/src/uml/qobjects/qumlassociationobject.cpp +++ b/src/uml/qobjects/qumlassociationobject.cpp @@ -514,6 +514,7 @@ bool QUmlAssociationObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlAssociationObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlclassobject.cpp b/src/uml/qobjects/qumlclassobject.cpp index bdc9b4b3..b85e5381 100644 --- a/src/uml/qobjects/qumlclassobject.cpp +++ b/src/uml/qobjects/qumlclassobject.cpp @@ -582,6 +582,7 @@ bool QUmlClassObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlClassObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlcollaborationobject.cpp b/src/uml/qobjects/qumlcollaborationobject.cpp index 2da18de6..ed185cff 100644 --- a/src/uml/qobjects/qumlcollaborationobject.cpp +++ b/src/uml/qobjects/qumlcollaborationobject.cpp @@ -539,6 +539,7 @@ bool QUmlCollaborationObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlCollaborationObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlcommunicationpathobject.cpp b/src/uml/qobjects/qumlcommunicationpathobject.cpp index 0dc7ab37..3ae87fdd 100644 --- a/src/uml/qobjects/qumlcommunicationpathobject.cpp +++ b/src/uml/qobjects/qumlcommunicationpathobject.cpp @@ -514,6 +514,7 @@ bool QUmlCommunicationPathObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlCommunicationPathObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlcomponentobject.cpp b/src/uml/qobjects/qumlcomponentobject.cpp index 4c28bc22..1a18a553 100644 --- a/src/uml/qobjects/qumlcomponentobject.cpp +++ b/src/uml/qobjects/qumlcomponentobject.cpp @@ -624,6 +624,7 @@ bool QUmlComponentObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlComponentObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumldatatypeobject.cpp b/src/uml/qobjects/qumldatatypeobject.cpp index 2a3636cd..58044170 100644 --- a/src/uml/qobjects/qumldatatypeobject.cpp +++ b/src/uml/qobjects/qumldatatypeobject.cpp @@ -484,6 +484,7 @@ bool QUmlDataTypeObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlDataTypeObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumldeploymentspecificationobject.cpp b/src/uml/qobjects/qumldeploymentspecificationobject.cpp index e385c37c..6bbcac75 100644 --- a/src/uml/qobjects/qumldeploymentspecificationobject.cpp +++ b/src/uml/qobjects/qumldeploymentspecificationobject.cpp @@ -528,6 +528,7 @@ bool QUmlDeploymentSpecificationObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlDeploymentSpecificationObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumldeviceobject.cpp b/src/uml/qobjects/qumldeviceobject.cpp index 6a2bcade..9bf22125 100644 --- a/src/uml/qobjects/qumldeviceobject.cpp +++ b/src/uml/qobjects/qumldeviceobject.cpp @@ -613,6 +613,7 @@ bool QUmlDeviceObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlDeviceObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlenumerationobject.cpp b/src/uml/qobjects/qumlenumerationobject.cpp index 3220de60..a4ee33c8 100644 --- a/src/uml/qobjects/qumlenumerationobject.cpp +++ b/src/uml/qobjects/qumlenumerationobject.cpp @@ -495,6 +495,7 @@ bool QUmlEnumerationObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlEnumerationObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlexecutionenvironmentobject.cpp b/src/uml/qobjects/qumlexecutionenvironmentobject.cpp index 69d17140..813c443b 100644 --- a/src/uml/qobjects/qumlexecutionenvironmentobject.cpp +++ b/src/uml/qobjects/qumlexecutionenvironmentobject.cpp @@ -613,6 +613,7 @@ bool QUmlExecutionEnvironmentObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlExecutionEnvironmentObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlextensionobject.cpp b/src/uml/qobjects/qumlextensionobject.cpp index 8a529a68..25c6a3ea 100644 --- a/src/uml/qobjects/qumlextensionobject.cpp +++ b/src/uml/qobjects/qumlextensionobject.cpp @@ -531,6 +531,7 @@ bool QUmlExtensionObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlExtensionObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlfinalstateobject.cpp b/src/uml/qobjects/qumlfinalstateobject.cpp index 3c11cee8..2c3e172a 100644 --- a/src/uml/qobjects/qumlfinalstateobject.cpp +++ b/src/uml/qobjects/qumlfinalstateobject.cpp @@ -419,7 +419,9 @@ bool QUmlFinalStateObject::membersAreDistinguishable() const } // OPERATIONS [RedefinableElement] + // OPERATIONS [Vertex] + // OPERATIONS [State] QObject *QUmlFinalStateObject::containingStateMachine() const diff --git a/src/uml/qobjects/qumlfunctionbehaviorobject.cpp b/src/uml/qobjects/qumlfunctionbehaviorobject.cpp index 1ee63f1b..4f18675e 100644 --- a/src/uml/qobjects/qumlfunctionbehaviorobject.cpp +++ b/src/uml/qobjects/qumlfunctionbehaviorobject.cpp @@ -662,6 +662,7 @@ bool QUmlFunctionBehaviorObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlFunctionBehaviorObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlinformationitemobject.cpp b/src/uml/qobjects/qumlinformationitemobject.cpp index 9c48e095..da67fdc2 100644 --- a/src/uml/qobjects/qumlinformationitemobject.cpp +++ b/src/uml/qobjects/qumlinformationitemobject.cpp @@ -475,6 +475,7 @@ bool QUmlInformationItemObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlInformationItemObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlinteractionobject.cpp b/src/uml/qobjects/qumlinteractionobject.cpp index cdfbe5bf..2c8738a1 100644 --- a/src/uml/qobjects/qumlinteractionobject.cpp +++ b/src/uml/qobjects/qumlinteractionobject.cpp @@ -733,6 +733,7 @@ bool QUmlInteractionObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlInteractionObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlinterfaceobject.cpp b/src/uml/qobjects/qumlinterfaceobject.cpp index 1d759158..47f2567b 100644 --- a/src/uml/qobjects/qumlinterfaceobject.cpp +++ b/src/uml/qobjects/qumlinterfaceobject.cpp @@ -518,6 +518,7 @@ bool QUmlInterfaceObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlInterfaceObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp b/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp index 8ffe8387..187cdc04 100644 --- a/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp +++ b/src/uml/qobjects/qumlliteralunlimitednaturalobject.cpp @@ -247,6 +247,7 @@ QString QUmlLiteralUnlimitedNaturalObject::stringValue() const { return qmodelingelementproperty_cast<QUmlLiteralUnlimitedNatural *>(this)->stringValue(); } + // OPERATIONS [LiteralUnlimitedNatural] bool QUmlLiteralUnlimitedNaturalObject::isComputable() const diff --git a/src/uml/qobjects/qumlmodelobject.cpp b/src/uml/qobjects/qumlmodelobject.cpp index 07c64868..21de1b6a 100644 --- a/src/uml/qobjects/qumlmodelobject.cpp +++ b/src/uml/qobjects/qumlmodelobject.cpp @@ -306,6 +306,7 @@ QSet<QObject *> QUmlModelObject::allOwnedElements() const set.insert(element->asQModelingObject()); return set; } + // OPERATIONS [NamedElement] QList<QObject *> QUmlModelObject::allNamespaces() const diff --git a/src/uml/qobjects/qumlnodeobject.cpp b/src/uml/qobjects/qumlnodeobject.cpp index 6b606b5b..90743d75 100644 --- a/src/uml/qobjects/qumlnodeobject.cpp +++ b/src/uml/qobjects/qumlnodeobject.cpp @@ -612,6 +612,7 @@ bool QUmlNodeObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlNodeObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlopaquebehaviorobject.cpp b/src/uml/qobjects/qumlopaquebehaviorobject.cpp index 49fe3dcd..ae3a0872 100644 --- a/src/uml/qobjects/qumlopaquebehaviorobject.cpp +++ b/src/uml/qobjects/qumlopaquebehaviorobject.cpp @@ -662,6 +662,7 @@ bool QUmlOpaqueBehaviorObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlOpaqueBehaviorObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlpackageobject.cpp b/src/uml/qobjects/qumlpackageobject.cpp index 5ceee086..386d1fdb 100644 --- a/src/uml/qobjects/qumlpackageobject.cpp +++ b/src/uml/qobjects/qumlpackageobject.cpp @@ -298,6 +298,7 @@ QSet<QObject *> QUmlPackageObject::allOwnedElements() const set.insert(element->asQModelingObject()); return set; } + // OPERATIONS [NamedElement] QList<QObject *> QUmlPackageObject::allNamespaces() const diff --git a/src/uml/qobjects/qumlprimitivetypeobject.cpp b/src/uml/qobjects/qumlprimitivetypeobject.cpp index 135ea89b..85a52583 100644 --- a/src/uml/qobjects/qumlprimitivetypeobject.cpp +++ b/src/uml/qobjects/qumlprimitivetypeobject.cpp @@ -484,6 +484,7 @@ bool QUmlPrimitiveTypeObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlPrimitiveTypeObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlprofileobject.cpp b/src/uml/qobjects/qumlprofileobject.cpp index fc587c19..e09fe17e 100644 --- a/src/uml/qobjects/qumlprofileobject.cpp +++ b/src/uml/qobjects/qumlprofileobject.cpp @@ -316,6 +316,7 @@ QSet<QObject *> QUmlProfileObject::allOwnedElements() const set.insert(element->asQModelingObject()); return set; } + // OPERATIONS [NamedElement] QList<QObject *> QUmlProfileObject::allNamespaces() const diff --git a/src/uml/qobjects/qumlprotocolstatemachineobject.cpp b/src/uml/qobjects/qumlprotocolstatemachineobject.cpp index baafc827..0addd043 100644 --- a/src/uml/qobjects/qumlprotocolstatemachineobject.cpp +++ b/src/uml/qobjects/qumlprotocolstatemachineobject.cpp @@ -691,7 +691,9 @@ bool QUmlProtocolStateMachineObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] + // OPERATIONS [TemplateableElement] QSet<QObject *> QUmlProtocolStateMachineObject::parameterableElements() const diff --git a/src/uml/qobjects/qumlregionobject.cpp b/src/uml/qobjects/qumlregionobject.cpp index 382861ec..0a650763 100644 --- a/src/uml/qobjects/qumlregionobject.cpp +++ b/src/uml/qobjects/qumlregionobject.cpp @@ -295,6 +295,7 @@ QString QUmlRegionObject::separator() const } // OPERATIONS [RedefinableElement] + // OPERATIONS [Namespace] QSet<QObject *> QUmlRegionObject::excludeCollisions(QSet<QObject *> imps) const diff --git a/src/uml/qobjects/qumlsignalobject.cpp b/src/uml/qobjects/qumlsignalobject.cpp index 31de211a..80fec808 100644 --- a/src/uml/qobjects/qumlsignalobject.cpp +++ b/src/uml/qobjects/qumlsignalobject.cpp @@ -475,6 +475,7 @@ bool QUmlSignalObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlSignalObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlstatemachineobject.cpp b/src/uml/qobjects/qumlstatemachineobject.cpp index 1b296da5..c42f6698 100644 --- a/src/uml/qobjects/qumlstatemachineobject.cpp +++ b/src/uml/qobjects/qumlstatemachineobject.cpp @@ -679,7 +679,9 @@ bool QUmlStateMachineObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] + // OPERATIONS [TemplateableElement] QSet<QObject *> QUmlStateMachineObject::parameterableElements() const diff --git a/src/uml/qobjects/qumlstateobject.cpp b/src/uml/qobjects/qumlstateobject.cpp index 9cd75976..078d8fe8 100644 --- a/src/uml/qobjects/qumlstateobject.cpp +++ b/src/uml/qobjects/qumlstateobject.cpp @@ -418,7 +418,9 @@ bool QUmlStateObject::membersAreDistinguishable() const } // OPERATIONS [RedefinableElement] + // OPERATIONS [Vertex] + // OPERATIONS [State] QObject *QUmlStateObject::containingStateMachine() const diff --git a/src/uml/qobjects/qumlstereotypeobject.cpp b/src/uml/qobjects/qumlstereotypeobject.cpp index 92912c94..d77a13b8 100644 --- a/src/uml/qobjects/qumlstereotypeobject.cpp +++ b/src/uml/qobjects/qumlstereotypeobject.cpp @@ -603,6 +603,7 @@ bool QUmlStereotypeObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlStereotypeObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qobjects/qumlusecaseobject.cpp b/src/uml/qobjects/qumlusecaseobject.cpp index 249e42f2..943600f7 100644 --- a/src/uml/qobjects/qumlusecaseobject.cpp +++ b/src/uml/qobjects/qumlusecaseobject.cpp @@ -529,6 +529,7 @@ bool QUmlUseCaseObject::isTemplateParameter() const } // OPERATIONS [Type] + // OPERATIONS [RedefinableElement] bool QUmlUseCaseObject::isConsistentWith(QObject *redefinee) const diff --git a/src/uml/qtumlnamespace.cpp b/src/uml/qtumlnamespace.cpp index 73a05489..58c38083 100644 --- a/src/uml/qtumlnamespace.cpp +++ b/src/uml/qtumlnamespace.cpp @@ -48,11 +48,8 @@ QT_BEGIN_NAMESPACE AggregationKind is an enumeration type that specifies the literals for defining the kind of aggregation of a property. \value AggregationKindNone Indicates that the property has no aggregation. - \value AggregationKindShared Indicates that the property has a shared aggregation. - - \value AggregationKindComposite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). - */ + \value AggregationKindComposite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). */ /*! \enum QtUml::CallConcurrencyKind @@ -60,11 +57,8 @@ QT_BEGIN_NAMESPACE CallConcurrencyKind is an enumeration type. \value CallConcurrencyKindSequential No concurrency management mechanism is associated with the operation and, therefore, concurrency conflicts may occur. Instances that invoke a behavioral feature need to coordinate so that only one invocation to a target on any behavioral feature occurs at once. - \value CallConcurrencyKindGuarded Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the currently executing behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks. - - \value CallConcurrencyKindConcurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. - */ + \value CallConcurrencyKindConcurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. */ /*! \enum QtUml::ConnectorKind @@ -72,9 +66,7 @@ QT_BEGIN_NAMESPACE ConnectorKind is an enumeration type. \value ConnectorKindAssembly Indicates that the connector is an assembly connector. - - \value ConnectorKindDelegation Indicates that the connector is a delegation connector. - */ + \value ConnectorKindDelegation Indicates that the connector is a delegation connector. */ /*! \enum QtUml::ExpansionKind @@ -82,11 +74,8 @@ QT_BEGIN_NAMESPACE ExpansionKind is an enumeration type used to specify how multiple executions of an expansion region interact. \value ExpansionKindParallel The executions are independent. They may be executed concurrently. - \value ExpansionKindIterative The executions are dependent and must be executed one at a time, in order of the collection elements. - - \value ExpansionKindStream A stream of collection elements flows into a single execution, in order of the collection elements. - */ + \value ExpansionKindStream A stream of collection elements flows into a single execution, in order of the collection elements. */ /*! \enum QtUml::InteractionOperatorKind @@ -94,29 +83,17 @@ QT_BEGIN_NAMESPACE InteractionOperatorKind is an enumeration designating the different kinds of operators of combined fragments. The interaction operand defines the type of operator of a combined fragment. \value InteractionOperatorKindSeq The interactionOperator seq designates that the CombinedFragment represents a weak sequencing between the behaviors of the operands. - \value InteractionOperatorKindAlt The interactionOperator alt designates that the CombinedFragment represents a choice of behavior. At most one of the operands will be chosen. The chosen operand must have an explicit or implicit guard expression that evaluates to true at this point in the interaction. An implicit true guard is implied if the operand has no guard. - \value InteractionOperatorKindOpt The interactionOperator opt designates that the CombinedFragment represents a choice of behavior where either the (sole) operand happens or nothing happens. An option is semantically equivalent to an alternative CombinedFragment where there is one operand with non-empty content and the second operand is empty. - \value InteractionOperatorKindBreak The interactionOperator break designates that the CombinedFragment represents a breaking scenario in the sense that the operand is a scenario that is performed instead of the remainder of the enclosing InteractionFragment. A break operator with a guard is chosen when the guard is true and the rest of the enclosing Interaction Fragment is ignored. When the guard of the break operand is false, the break operand is ignored and the rest of the enclosing InteractionFragment is chosen. The choice between a break operand without a guard and the rest of the enclosing InteractionFragment is done non-deterministically. - \value InteractionOperatorKindPar The interactionOperator par designates that the CombinedFragment represents a parallel merge between the behaviors of the operands. The OccurrenceSpecifications of the different operands can be interleaved in any way as long as the ordering imposed by each operand as such is preserved. - \value InteractionOperatorKindStrict The interactionOperator strict designates that the CombinedFragment represents a strict sequencing between the behaviors of the operands. The semantics of strict sequencing defines a strict ordering of the operands on the first level within the CombinedFragment with interactionOperator strict. Therefore OccurrenceSpecifications within contained CombinedFragment will not directly be compared with other OccurrenceSpecifications of the enclosing CombinedFragment. - \value InteractionOperatorKindLoop The interactionOperator loop designates that the CombinedFragment represents a loop. The loop operand will be repeated a number of times. - \value InteractionOperatorKindCritical The interactionOperator critical designates that the CombinedFragment represents a critical region. A critical region means that the traces of the region cannot be interleaved by other OccurrenceSpecifications (on those Lifelines covered by the region). This means that the region is treated atomically by the enclosing fragment when determining the set of valid traces. Even though enclosing CombinedFragments may imply that some OccurrenceSpecifications may interleave into the region, such as e.g. with par-operator, this is prevented by defining a region. - \value InteractionOperatorKindNeg The interactionOperator neg designates that the CombinedFragment represents traces that are defined to be invalid. - \value InteractionOperatorKindAssert The interactionOperator assert designates that the CombinedFragment represents an assertion. The sequences of the operand of the assertion are the only valid continuations. All other continuations result in an invalid trace. - \value InteractionOperatorKindIgnore The interacionOperator ignore designates that there are some message types that are not shown within this combined fragment. These message types can be considered insignificant and are implicitly ignored if they appear in a corresponding execution. Alternatively, one can understand ignore to mean that the message types that are ignored can appear anywhere in the traces. - - \value InteractionOperatorKindConsider The interactionOperator consider designates which messages should be considered within this combined fragment. This is equivalent to defining every other message to be ignored. - */ + \value InteractionOperatorKindConsider The interactionOperator consider designates which messages should be considered within this combined fragment. This is equivalent to defining every other message to be ignored. */ /*! \enum QtUml::MessageKind @@ -124,13 +101,9 @@ QT_BEGIN_NAMESPACE This is an enumerated type that identifies the type of message. \value MessageKindComplete sendEvent and receiveEvent are present - \value MessageKindLost sendEvent present and receiveEvent absent - \value MessageKindFound sendEvent absent and receiveEvent present - - \value MessageKindUnknown sendEvent and receiveEvent absent (should not appear) - */ + \value MessageKindUnknown sendEvent and receiveEvent absent (should not appear) */ /*! \enum QtUml::MessageSort @@ -138,17 +111,11 @@ QT_BEGIN_NAMESPACE This is an enumerated type that identifies the type of communication action that was used to generate the message. \value MessageSortSynchCall The message was generated by a synchronous call to an operation. - \value MessageSortAsynchCall The message was generated by an asynchronous call to an operation; i.e., a CallAction with isSynchronous = false. - \value MessageSortAsynchSignal The message was generated by an asynchronous send action. - \value MessageSortCreateMessage The message designating the creation of another lifeline object. - \value MessageSortDeleteMessage The message designating the termination of another lifeline. - - \value MessageSortReply The message is a reply message to an operation call. - */ + \value MessageSortReply The message is a reply message to an operation call. */ /*! \enum QtUml::ObjectNodeOrderingKind @@ -156,13 +123,9 @@ QT_BEGIN_NAMESPACE ObjectNodeOrderingKind is an enumeration indicating queuing order within a node. \value ObjectNodeOrderingKindUnordered Indicates that object node tokens are unordered. - \value ObjectNodeOrderingKindOrdered Indicates that object node tokens are ordered. - \value ObjectNodeOrderingKindLIFO Indicates that object node tokens are queued in a last in, first out manner. - - \value ObjectNodeOrderingKindFIFO Indicates that object node tokens are queued in a first in, first out manner. - */ + \value ObjectNodeOrderingKindFIFO Indicates that object node tokens are queued in a first in, first out manner. */ /*! \enum QtUml::ParameterDirectionKind @@ -170,13 +133,9 @@ QT_BEGIN_NAMESPACE Parameter direction kind is an enumeration type that defines literals used to specify direction of parameters. \value ParameterDirectionKindIn Indicates that parameter values are passed into the behavioral element by the caller. - \value ParameterDirectionKindInout Indicates that parameter values are passed into a behavioral element by the caller and then back out to the caller from the behavioral element. - \value ParameterDirectionKindOut Indicates that parameter values are passed from a behavioral element out to the caller. - - \value ParameterDirectionKindReturn Indicates that parameter values are passed as return values from a behavioral element back to the caller. - */ + \value ParameterDirectionKindReturn Indicates that parameter values are passed as return values from a behavioral element back to the caller. */ /*! \enum QtUml::ParameterEffectKind @@ -184,13 +143,9 @@ QT_BEGIN_NAMESPACE The datatype ParameterEffectKind is an enumeration that indicates the effect of a behavior on values passed in or out of its parameters. \value ParameterEffectKindCreate Indicates that the behavior creates values. - \value ParameterEffectKindRead Indicates that the behavior reads values. - \value ParameterEffectKindUpdate Indicates that the behavior updates values. - - \value ParameterEffectKindDelete Indicates that the behavior deletes values. - */ + \value ParameterEffectKindDelete Indicates that the behavior deletes values. */ /*! \enum QtUml::PseudostateKind @@ -198,25 +153,15 @@ QT_BEGIN_NAMESPACE PseudostateKind is an enumeration type. \value PseudostateKindInitial An initial pseudostate represents a default vertex that is the source for a single transition to the default state of a composite state. There can be at most one initial vertex in a region. The outgoing transition from the initial vertex may have a behavior, but not a trigger or guard. - \value PseudostateKindDeepHistory DeepHistory represents the most recent active configuration of the composite state that directly contains this pseudostate; e.g. the state configuration that was active when the composite state was last exited. A composite state can have at most one deep history vertex. At most one transition may originate from the history connector to the default deep history state. This transition is taken in case the composite state had never been active before. Entry actions of states entered on the path to the state represented by a deep history are performed. - \value PseudostateKindShallowHistory ShallowHistory represents the most recent active substate of its containing state (but not the substates of that substate). A composite state can have at most one shallow history vertex. A transition coming into the shallow history vertex is equivalent to a transition coming into the most recent active substate of a state. At most one transition may originate from the history connector to the default shallow history state. This transition is taken in case the composite state had never been active before. Entry actions of states entered on the path to the state represented by a shallow history are performed. - \value PseudostateKindJoin Join vertices serve to merge several transitions emanating from source vertices in different orthogonal regions. The transitions entering a join vertex cannot have guards or triggers. - \value PseudostateKindFork Fork vertices serve to split an incoming transition into two or more transitions terminating on orthogonal target vertices (i.e. vertices in different regions of a composite state). The segments outgoing from a fork vertex must not have guards or triggers. - \value PseudostateKindJunction Junction vertices are semantic-free vertices that are used to chain together multiple transitions. They are used to construct compound transition paths between states. For example, a junction can be used to converge multiple incoming transitions into a single outgoing transition representing a shared transition path (this is known as an merge). Conversely, they can be used to split an incoming transition into multiple outgoing transition segments with different guard conditions. This realizes a static conditional branch. (In the latter case, outgoing transitions whose guard conditions evaluate to false are disabled. A predefined guard denoted 'else' may be defined for at most one outgoing transition. This transition is enabled if all the guards labeling the other transitions are false.) Static conditional branches are distinct from dynamic conditional branches that are realized by choice vertices (described below). - \value PseudostateKindChoice Choice vertices which, when reached, result in the dynamic evaluation of the guards of the triggers of its outgoing transitions. This realizes a dynamic conditional branch. It allows splitting of transitions into multiple outgoing paths such that the decision on which path to take may be a function of the results of prior actions performed in the same run-tocompletion step. If more than one of the guards evaluates to true, an arbitrary one is selected. If none of the guards evaluates to true, then the model is considered ill-formed. (To avoid this, it is recommended to define one outgoing transition with the predefined else guard for every choice vertex.) Choice vertices should be distinguished from static branch points that are based on junction points (described above). - \value PseudostateKindEntryPoint An entry point pseudostate is an entry point of a state machine or composite state. In each region of the state machine or composite state it has a single transition to a vertex within the same region. - \value PseudostateKindExitPoint An exit point pseudostate is an exit point of a state machine or composite state. Entering an exit point within any region of the composite state or state machine referenced by a submachine state implies the exit of this composite state or submachine state and the triggering of the transition that has this exit point as source in the state machine enclosing the submachine or composite state. - - \value PseudostateKindTerminate Entering a terminate pseudostate implies that the execution of this state machine by means of its context object is terminated. The state machine does not exit any states nor does it perform any exit actions other than those associated with the transition leading to the terminate pseudostate. Entering a terminate pseudostate is equivalent to invoking a DestroyObjectAction. - */ + \value PseudostateKindTerminate Entering a terminate pseudostate implies that the execution of this state machine by means of its context object is terminated. The state machine does not exit any states nor does it perform any exit actions other than those associated with the transition leading to the terminate pseudostate. Entering a terminate pseudostate is equivalent to invoking a DestroyObjectAction. */ /*! \enum QtUml::TransitionKind @@ -224,11 +169,8 @@ QT_BEGIN_NAMESPACE TransitionKind is an enumeration type. \value TransitionKindInternal Implies that the transition, if triggered, occurs without exiting or entering the source state. Thus, it does not cause a state change. This means that the entry or exit condition of the source state will not be invoked. An internal transition can be taken even if the state machine is in one or more regions nested within this state. - \value TransitionKindLocal Implies that the transition, if triggered, will not exit the composite (source) state, but it will apply to any state within the composite state, and these will be exited and entered. - - \value TransitionKindExternal Implies that the transition, if triggered, will exit the composite (source) state. - */ + \value TransitionKindExternal Implies that the transition, if triggered, will exit the composite (source) state. */ /*! \enum QtUml::VisibilityKind @@ -236,12 +178,8 @@ QT_BEGIN_NAMESPACE VisibilityKind is an enumeration type that defines literals to determine the visibility of elements in a model. \value VisibilityKindPublic A public element is visible to all elements that can access the contents of the namespace that owns it. - \value VisibilityKindPrivate A private element is only visible inside the namespace that owns it. - \value VisibilityKindProtected A protected element is visible to elements that have a generalization relationship to the namespace that owns it. - - \value VisibilityKindPackage A package element is owned by a namespace that is not a package, and is visible to elements that are in the same package as its owning namespace. Only named elements that are not owned by packages can be marked as having package visibility. Any element marked as having package visibility is visible to all elements within the nearest enclosing package (given that other owning elements have proper visibility). Outside the nearest enclosing package, an element marked as having package visibility is not visible. - */ + \value VisibilityKindPackage A package element is owned by a namespace that is not a package, and is visible to elements that are in the same package as its owning namespace. Only named elements that are not owned by packages can be marked as having package visibility. Any element marked as having package visibility is visible to all elements within the nearest enclosing package (given that other owning elements have proper visibility). Outside the nearest enclosing package, an element marked as having package visibility is not visible. */ QT_END_NAMESPACE diff --git a/src/uml/qumlabstraction.cpp b/src/uml/qumlabstraction.cpp index 63132edf..c22b9f6e 100644 --- a/src/uml/qumlabstraction.cpp +++ b/src/uml/qumlabstraction.cpp @@ -43,7 +43,6 @@ #include "private/qumlabstractionobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> diff --git a/src/uml/qumlaction.cpp b/src/uml/qumlaction.cpp index 8d936a72..981d9846 100644 --- a/src/uml/qumlaction.cpp +++ b/src/uml/qumlaction.cpp @@ -118,7 +118,7 @@ QUmlClassifier *QUmlAction::context() const { // This is a read-only derived association end - qWarning("UmlAction::context(): to be implemented (this is a derived association end)"); + qWarning("QUmlAction::context(): to be implemented (this is a derived association end)"); return 0; } @@ -127,7 +127,7 @@ void QUmlAction::setContext(QUmlClassifier *context) { // This is a read-only derived association end - qWarning("UmlAction::setContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlAction::setContext(): to be implemented (this is a derived association end)"); Q_UNUSED(context); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlaction.h b/src/uml/qumlaction.h index e3718c94..d9f27ecb 100644 --- a/src/uml/qumlaction.h +++ b/src/uml/qumlaction.h @@ -59,7 +59,6 @@ class QUmlOutputPin; class Q_UML_EXPORT QUmlAction : public QUmlExecutableNode { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactivity.cpp b/src/uml/qumlactivity.cpp index 925944e8..40b8ee7d 100644 --- a/src/uml/qumlactivity.cpp +++ b/src/uml/qumlactivity.cpp @@ -46,7 +46,6 @@ #include <QtUml/QUmlActivityGroup> #include <QtUml/QUmlActivityNode> #include <QtUml/QUmlActivityPartition> -#include <QtUml/QUmlBehavior> #include <QtUml/QUmlBehavioralFeature> #include <QtUml/QUmlBehavioredClassifier> #include <QtUml/QUmlClass> diff --git a/src/uml/qumlactivityedge.cpp b/src/uml/qumlactivityedge.cpp index d002b064..b80ed8d0 100644 --- a/src/uml/qumlactivityedge.cpp +++ b/src/uml/qumlactivityedge.cpp @@ -52,7 +52,6 @@ #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlStructuredActivityNode> #include <QtUml/QUmlValueSpecification> diff --git a/src/uml/qumlactivityedge.h b/src/uml/qumlactivityedge.h index 5d48b88d..82004e4b 100644 --- a/src/uml/qumlactivityedge.h +++ b/src/uml/qumlactivityedge.h @@ -62,7 +62,6 @@ class QUmlValueSpecification; class Q_UML_EXPORT QUmlActivityEdge : public QUmlRedefinableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactivitygroup.cpp b/src/uml/qumlactivitygroup.cpp index 107cdfe2..a478e3a0 100644 --- a/src/uml/qumlactivitygroup.cpp +++ b/src/uml/qumlactivitygroup.cpp @@ -46,7 +46,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumlactivitygroup.h b/src/uml/qumlactivitygroup.h index ad5b55a1..7fefc24a 100644 --- a/src/uml/qumlactivitygroup.h +++ b/src/uml/qumlactivitygroup.h @@ -58,7 +58,6 @@ class QUmlActivityNode; class Q_UML_EXPORT QUmlActivityGroup : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactivitynode.cpp b/src/uml/qumlactivitynode.cpp index d0fdb12a..65386cf1 100644 --- a/src/uml/qumlactivitynode.cpp +++ b/src/uml/qumlactivitynode.cpp @@ -52,7 +52,6 @@ #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlStructuredActivityNode> diff --git a/src/uml/qumlactivitynode.h b/src/uml/qumlactivitynode.h index d40b9642..d88c87a6 100644 --- a/src/uml/qumlactivitynode.h +++ b/src/uml/qumlactivitynode.h @@ -61,7 +61,6 @@ class QUmlStructuredActivityNode; class Q_UML_EXPORT QUmlActivityNode : public QUmlRedefinableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlactivitypartition.cpp b/src/uml/qumlactivitypartition.cpp index 9d4d6754..2cd27bbd 100644 --- a/src/uml/qumlactivitypartition.cpp +++ b/src/uml/qumlactivitypartition.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> -#include <QtUml/QUmlActivityGroup> #include <QtUml/QUmlActivityNode> #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> diff --git a/src/uml/qumlartifact.cpp b/src/uml/qumlartifact.cpp index 994f0560..94d8fe31 100644 --- a/src/uml/qumlartifact.cpp +++ b/src/uml/qumlartifact.cpp @@ -42,7 +42,6 @@ #include "private/qumlartifactobject_p.h" -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> diff --git a/src/uml/qumlassociation.cpp b/src/uml/qumlassociation.cpp index f03cd027..0538b1fa 100644 --- a/src/uml/qumlassociation.cpp +++ b/src/uml/qumlassociation.cpp @@ -42,7 +42,6 @@ #include "private/qumlassociationobject_p.h" -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> @@ -149,7 +148,7 @@ const QList<QUmlType *> QUmlAssociation::endTypes() const { // This is a read-only derived association end - qWarning("UmlAssociation::endTypes(): to be implemented (this is a derived association end)"); + qWarning("QUmlAssociation::endTypes(): to be implemented (this is a derived association end)"); return QList<QUmlType *>(); } @@ -158,7 +157,7 @@ void QUmlAssociation::addEndType(QUmlType *endType) { // This is a read-only derived association end - qWarning("UmlAssociation::addEndType(): to be implemented (this is a derived association end)"); + qWarning("QUmlAssociation::addEndType(): to be implemented (this is a derived association end)"); Q_UNUSED(endType); if (false /* <derivedexclusion-criteria> */) { @@ -173,7 +172,7 @@ void QUmlAssociation::removeEndType(QUmlType *endType) { // This is a read-only derived association end - qWarning("UmlAssociation::removeEndType(): to be implemented (this is a derived association end)"); + qWarning("QUmlAssociation::removeEndType(): to be implemented (this is a derived association end)"); Q_UNUSED(endType); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlassociationclass.cpp b/src/uml/qumlassociationclass.cpp index b88eab45..3cc2f84e 100644 --- a/src/uml/qumlassociationclass.cpp +++ b/src/uml/qumlassociationclass.cpp @@ -43,7 +43,6 @@ #include "private/qumlassociationclassobject_p.h" #include <QtUml/QUmlBehavior> -#include <QtUml/QUmlClass> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> diff --git a/src/uml/qumlbehavior.cpp b/src/uml/qumlbehavior.cpp index f58f33d9..b1cce3b8 100644 --- a/src/uml/qumlbehavior.cpp +++ b/src/uml/qumlbehavior.cpp @@ -42,7 +42,6 @@ #include <QtUml/QUmlBehavioralFeature> #include <QtUml/QUmlBehavioredClassifier> -#include <QtUml/QUmlClass> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> @@ -182,7 +181,7 @@ QUmlBehavioredClassifier *QUmlBehavior::context() const { // This is a read-only derived association end - qWarning("UmlBehavior::context(): to be implemented (this is a derived association end)"); + qWarning("QUmlBehavior::context(): to be implemented (this is a derived association end)"); return 0; } @@ -191,7 +190,7 @@ void QUmlBehavior::setContext(QUmlBehavioredClassifier *context) { // This is a read-only derived association end - qWarning("UmlBehavior::setContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlBehavior::setContext(): to be implemented (this is a derived association end)"); Q_UNUSED(context); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlbehavior.h b/src/uml/qumlbehavior.h index 8e5f07d2..52af5cb0 100644 --- a/src/uml/qumlbehavior.h +++ b/src/uml/qumlbehavior.h @@ -60,7 +60,6 @@ class QUmlParameterSet; class Q_UML_EXPORT QUmlBehavior : public QUmlClass { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlbehavioralfeature.cpp b/src/uml/qumlbehavioralfeature.cpp index 000130b7..ef0f4c00 100644 --- a/src/uml/qumlbehavioralfeature.cpp +++ b/src/uml/qumlbehavioralfeature.cpp @@ -48,7 +48,6 @@ #include <QtUml/QUmlElement> #include <QtUml/QUmlElementImport> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> @@ -300,7 +299,7 @@ void QUmlBehavioralFeature::removeRaisedException(QUmlType *raisedException) */ bool QUmlBehavioralFeature::isDistinguishableFrom(QUmlNamedElement *n, QUmlNamespace *ns) const { - qWarning("UmlBehavioralFeature::isDistinguishableFrom(): to be implemented (operation)"); + qWarning("QUmlBehavioralFeature::isDistinguishableFrom(): to be implemented (operation)"); Q_UNUSED(n); Q_UNUSED(ns); diff --git a/src/uml/qumlbehavioralfeature.h b/src/uml/qumlbehavioralfeature.h index ca879bfe..bd79baea 100644 --- a/src/uml/qumlbehavioralfeature.h +++ b/src/uml/qumlbehavioralfeature.h @@ -46,8 +46,8 @@ #include <QtUml/QUmlNamespace> #include <QtUml/QUmlFeature> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -63,7 +63,6 @@ class QUmlType; class Q_UML_EXPORT QUmlBehavioralFeature : public QUmlNamespace, public QUmlFeature { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlbehavioredclassifier.cpp b/src/uml/qumlbehavioredclassifier.cpp index 9443dcc4..333efd2c 100644 --- a/src/uml/qumlbehavioredclassifier.cpp +++ b/src/uml/qumlbehavioredclassifier.cpp @@ -41,7 +41,6 @@ #include "qumlbehavioredclassifier.h" #include <QtUml/QUmlBehavior> -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> diff --git a/src/uml/qumlbehavioredclassifier.h b/src/uml/qumlbehavioredclassifier.h index 4ecd48a6..c32dacb0 100644 --- a/src/uml/qumlbehavioredclassifier.h +++ b/src/uml/qumlbehavioredclassifier.h @@ -57,7 +57,6 @@ class QUmlInterfaceRealization; class Q_UML_EXPORT QUmlBehavioredClassifier : public virtual QUmlClassifier { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlcallaction.h b/src/uml/qumlcallaction.h index df40b06f..bba29b8b 100644 --- a/src/uml/qumlcallaction.h +++ b/src/uml/qumlcallaction.h @@ -56,7 +56,6 @@ class QUmlOutputPin; class Q_UML_EXPORT QUmlCallAction : public QUmlInvocationAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlclass.cpp b/src/uml/qumlclass.cpp index 710f2d96..8f9931ca 100644 --- a/src/uml/qumlclass.cpp +++ b/src/uml/qumlclass.cpp @@ -168,7 +168,7 @@ const QSet<QUmlExtension *> QUmlClass::extensions() const { // This is a read-only derived association end - qWarning("UmlClass::extensions(): to be implemented (this is a derived association end)"); + qWarning("QUmlClass::extensions(): to be implemented (this is a derived association end)"); return QSet<QUmlExtension *>(); } @@ -177,7 +177,7 @@ void QUmlClass::addExtension(QUmlExtension *extension) { // This is a read-only derived association end - qWarning("UmlClass::addExtension(): to be implemented (this is a derived association end)"); + qWarning("QUmlClass::addExtension(): to be implemented (this is a derived association end)"); Q_UNUSED(extension); if (false /* <derivedexclusion-criteria> */) { @@ -194,7 +194,7 @@ void QUmlClass::removeExtension(QUmlExtension *extension) { // This is a read-only derived association end - qWarning("UmlClass::removeExtension(): to be implemented (this is a derived association end)"); + qWarning("QUmlClass::removeExtension(): to be implemented (this is a derived association end)"); Q_UNUSED(extension); if (false /* <derivedexclusion-criteria> */) { @@ -436,7 +436,7 @@ const QSet<QUmlClass *> QUmlClass::superClasses() const { // This is a read-write derived association end - qWarning("UmlClass::superClasses(): to be implemented (this is a derived association end)"); + qWarning("QUmlClass::superClasses(): to be implemented (this is a derived association end)"); return QSet<QUmlClass *>(); } @@ -445,7 +445,7 @@ void QUmlClass::addSuperClass(QUmlClass *superClass) { // This is a read-write derived association end - qWarning("UmlClass::addSuperClass(): to be implemented (this is a derived association end)"); + qWarning("QUmlClass::addSuperClass(): to be implemented (this is a derived association end)"); Q_UNUSED(superClass); if (false /* <derivedexclusion-criteria> */) { @@ -457,7 +457,7 @@ void QUmlClass::removeSuperClass(QUmlClass *superClass) { // This is a read-write derived association end - qWarning("UmlClass::removeSuperClass(): to be implemented (this is a derived association end)"); + qWarning("QUmlClass::removeSuperClass(): to be implemented (this is a derived association end)"); Q_UNUSED(superClass); if (false /* <derivedexclusion-criteria> */) { @@ -472,7 +472,7 @@ void QUmlClass::removeSuperClass(QUmlClass *superClass) */ QSet<QUmlNamedElement *> QUmlClass::inherit(QSet<QUmlNamedElement *> inhs) const { - qWarning("UmlClass::inherit(): to be implemented (operation)"); + qWarning("QUmlClass::inherit(): to be implemented (operation)"); Q_UNUSED(inhs); return QSet<QUmlNamedElement *> (); diff --git a/src/uml/qumlclassifier.cpp b/src/uml/qumlclassifier.cpp index 6f2d3923..6856c80b 100644 --- a/src/uml/qumlclassifier.cpp +++ b/src/uml/qumlclassifier.cpp @@ -51,20 +51,17 @@ #include <QtUml/QUmlGeneralization> #include <QtUml/QUmlGeneralizationSet> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlProperty> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlRedefinableTemplateSignature> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlSubstitution> #include <QtUml/QUmlTemplateBinding> #include <QtUml/QUmlTemplateParameter> #include <QtUml/QUmlTemplateSignature> -#include <QtUml/QUmlType> #include <QtUml/QUmlUseCase> /*! @@ -262,7 +259,7 @@ const QSet<QUmlClassifier *> QUmlClassifier::generals() const { // This is a read-write derived association end - qWarning("UmlClassifier::generals(): to be implemented (this is a derived association end)"); + qWarning("QUmlClassifier::generals(): to be implemented (this is a derived association end)"); return QSet<QUmlClassifier *>(); } @@ -271,7 +268,7 @@ void QUmlClassifier::addGeneral(QUmlClassifier *general) { // This is a read-write derived association end - qWarning("UmlClassifier::addGeneral(): to be implemented (this is a derived association end)"); + qWarning("QUmlClassifier::addGeneral(): to be implemented (this is a derived association end)"); Q_UNUSED(general); if (false /* <derivedexclusion-criteria> */) { @@ -283,7 +280,7 @@ void QUmlClassifier::removeGeneral(QUmlClassifier *general) { // This is a read-write derived association end - qWarning("UmlClassifier::removeGeneral(): to be implemented (this is a derived association end)"); + qWarning("QUmlClassifier::removeGeneral(): to be implemented (this is a derived association end)"); Q_UNUSED(general); if (false /* <derivedexclusion-criteria> */) { @@ -347,7 +344,7 @@ const QSet<QUmlNamedElement *> QUmlClassifier::inheritedMembers() const { // This is a read-only derived association end - qWarning("UmlClassifier::inheritedMembers(): to be implemented (this is a derived association end)"); + qWarning("QUmlClassifier::inheritedMembers(): to be implemented (this is a derived association end)"); return QSet<QUmlNamedElement *>(); } @@ -356,7 +353,7 @@ void QUmlClassifier::addInheritedMember(QUmlNamedElement *inheritedMember) { // This is a read-only derived association end - qWarning("UmlClassifier::addInheritedMember(): to be implemented (this is a derived association end)"); + qWarning("QUmlClassifier::addInheritedMember(): to be implemented (this is a derived association end)"); Q_UNUSED(inheritedMember); if (false /* <derivedexclusion-criteria> */) { @@ -371,7 +368,7 @@ void QUmlClassifier::removeInheritedMember(QUmlNamedElement *inheritedMember) { // This is a read-only derived association end - qWarning("UmlClassifier::removeInheritedMember(): to be implemented (this is a derived association end)"); + qWarning("QUmlClassifier::removeInheritedMember(): to be implemented (this is a derived association end)"); Q_UNUSED(inheritedMember); if (false /* <derivedexclusion-criteria> */) { @@ -707,7 +704,7 @@ void QUmlClassifier::removeUseCase(QUmlUseCase *useCase) */ QSet<QUmlFeature *> QUmlClassifier::allFeatures() const { - qWarning("UmlClassifier::allFeatures(): to be implemented (operation)"); + qWarning("QUmlClassifier::allFeatures(): to be implemented (operation)"); return QSet<QUmlFeature *> (); } @@ -717,7 +714,7 @@ QSet<QUmlFeature *> QUmlClassifier::allFeatures() const */ QSet<QUmlClassifier *> QUmlClassifier::allParents() const { - qWarning("UmlClassifier::allParents(): to be implemented (operation)"); + qWarning("QUmlClassifier::allParents(): to be implemented (operation)"); return QSet<QUmlClassifier *> (); } @@ -727,7 +724,7 @@ QSet<QUmlClassifier *> QUmlClassifier::allParents() const */ bool QUmlClassifier::conformsTo(QUmlClassifier *other) const { - qWarning("UmlClassifier::conformsTo(): to be implemented (operation)"); + qWarning("QUmlClassifier::conformsTo(): to be implemented (operation)"); Q_UNUSED(other); return bool (); @@ -738,7 +735,7 @@ bool QUmlClassifier::conformsTo(QUmlClassifier *other) const */ bool QUmlClassifier::hasVisibilityOf(QUmlNamedElement *n) const { - qWarning("UmlClassifier::hasVisibilityOf(): to be implemented (operation)"); + qWarning("QUmlClassifier::hasVisibilityOf(): to be implemented (operation)"); Q_UNUSED(n); return bool (); @@ -749,7 +746,7 @@ bool QUmlClassifier::hasVisibilityOf(QUmlNamedElement *n) const */ QSet<QUmlNamedElement *> QUmlClassifier::inherit(QSet<QUmlNamedElement *> inhs) const { - qWarning("UmlClassifier::inherit(): to be implemented (operation)"); + qWarning("QUmlClassifier::inherit(): to be implemented (operation)"); Q_UNUSED(inhs); return QSet<QUmlNamedElement *> (); @@ -760,7 +757,7 @@ QSet<QUmlNamedElement *> QUmlClassifier::inherit(QSet<QUmlNamedElement *> inhs) */ QSet<QUmlNamedElement *> QUmlClassifier::inheritableMembers(QUmlClassifier *c) const { - qWarning("UmlClassifier::inheritableMembers(): to be implemented (operation)"); + qWarning("QUmlClassifier::inheritableMembers(): to be implemented (operation)"); Q_UNUSED(c); return QSet<QUmlNamedElement *> (); @@ -771,7 +768,7 @@ QSet<QUmlNamedElement *> QUmlClassifier::inheritableMembers(QUmlClassifier *c) c */ bool QUmlClassifier::isTemplate() const { - qWarning("UmlClassifier::isTemplate(): to be implemented (operation)"); + qWarning("QUmlClassifier::isTemplate(): to be implemented (operation)"); return bool (); } @@ -781,7 +778,7 @@ bool QUmlClassifier::isTemplate() const */ bool QUmlClassifier::maySpecializeType(QUmlClassifier *c) const { - qWarning("UmlClassifier::maySpecializeType(): to be implemented (operation)"); + qWarning("QUmlClassifier::maySpecializeType(): to be implemented (operation)"); Q_UNUSED(c); return bool (); @@ -792,7 +789,7 @@ bool QUmlClassifier::maySpecializeType(QUmlClassifier *c) const */ QSet<QUmlClassifier *> QUmlClassifier::parents() const { - qWarning("UmlClassifier::parents(): to be implemented (operation)"); + qWarning("QUmlClassifier::parents(): to be implemented (operation)"); return QSet<QUmlClassifier *> (); } diff --git a/src/uml/qumlclassifier.h b/src/uml/qumlclassifier.h index b6ead7f0..68ec91b1 100644 --- a/src/uml/qumlclassifier.h +++ b/src/uml/qumlclassifier.h @@ -68,7 +68,6 @@ class QUmlUseCase; class Q_UML_EXPORT QUmlClassifier : public QUmlNamespace, public QUmlType, public QUmlRedefinableElement, public QUmlTemplateableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlclause.cpp b/src/uml/qumlclause.cpp index d973f035..7d6c67b4 100644 --- a/src/uml/qumlclause.cpp +++ b/src/uml/qumlclause.cpp @@ -43,7 +43,6 @@ #include "private/qumlclauseobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlExecutableNode> #include <QtUml/QUmlOutputPin> diff --git a/src/uml/qumlcollaborationuse.cpp b/src/uml/qumlcollaborationuse.cpp index 1c4ce7ac..59cd73f9 100644 --- a/src/uml/qumlcollaborationuse.cpp +++ b/src/uml/qumlcollaborationuse.cpp @@ -46,7 +46,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumlcombinedfragment.h b/src/uml/qumlcombinedfragment.h index c9ddd634..7c30343d 100644 --- a/src/uml/qumlcombinedfragment.h +++ b/src/uml/qumlcombinedfragment.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlInteractionFragment> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlcomment.cpp b/src/uml/qumlcomment.cpp index 8193e1ce..0e670039 100644 --- a/src/uml/qumlcomment.cpp +++ b/src/uml/qumlcomment.cpp @@ -42,8 +42,6 @@ #include "private/qumlcommentobject_p.h" -#include <QtUml/QUmlElement> - /*! \class QUmlComment diff --git a/src/uml/qumlcomponent.cpp b/src/uml/qumlcomponent.cpp index bc33118d..d701db57 100644 --- a/src/uml/qumlcomponent.cpp +++ b/src/uml/qumlcomponent.cpp @@ -43,7 +43,6 @@ #include "private/qumlcomponentobject_p.h" #include <QtUml/QUmlBehavior> -#include <QtUml/QUmlClass> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> @@ -235,7 +234,7 @@ const QSet<QUmlInterface *> QUmlComponent::provided() const { // This is a read-only derived association end - qWarning("UmlComponent::provided(): to be implemented (this is a derived association end)"); + qWarning("QUmlComponent::provided(): to be implemented (this is a derived association end)"); return QSet<QUmlInterface *>(); } @@ -244,7 +243,7 @@ void QUmlComponent::addProvided(QUmlInterface *provided) { // This is a read-only derived association end - qWarning("UmlComponent::addProvided(): to be implemented (this is a derived association end)"); + qWarning("QUmlComponent::addProvided(): to be implemented (this is a derived association end)"); Q_UNUSED(provided); if (false /* <derivedexclusion-criteria> */) { @@ -256,7 +255,7 @@ void QUmlComponent::removeProvided(QUmlInterface *provided) { // This is a read-only derived association end - qWarning("UmlComponent::removeProvided(): to be implemented (this is a derived association end)"); + qWarning("QUmlComponent::removeProvided(): to be implemented (this is a derived association end)"); Q_UNUSED(provided); if (false /* <derivedexclusion-criteria> */) { @@ -320,7 +319,7 @@ const QSet<QUmlInterface *> QUmlComponent::required() const { // This is a read-only derived association end - qWarning("UmlComponent::required(): to be implemented (this is a derived association end)"); + qWarning("QUmlComponent::required(): to be implemented (this is a derived association end)"); return QSet<QUmlInterface *>(); } @@ -329,7 +328,7 @@ void QUmlComponent::addRequired(QUmlInterface *required) { // This is a read-only derived association end - qWarning("UmlComponent::addRequired(): to be implemented (this is a derived association end)"); + qWarning("QUmlComponent::addRequired(): to be implemented (this is a derived association end)"); Q_UNUSED(required); if (false /* <derivedexclusion-criteria> */) { @@ -341,7 +340,7 @@ void QUmlComponent::removeRequired(QUmlInterface *required) { // This is a read-only derived association end - qWarning("UmlComponent::removeRequired(): to be implemented (this is a derived association end)"); + qWarning("QUmlComponent::removeRequired(): to be implemented (this is a derived association end)"); Q_UNUSED(required); if (false /* <derivedexclusion-criteria> */) { @@ -356,7 +355,7 @@ void QUmlComponent::removeRequired(QUmlInterface *required) */ QSet<QUmlInterface *> QUmlComponent::realizedInterfaces(QUmlClassifier *classifier) const { - qWarning("UmlComponent::realizedInterfaces(): to be implemented (operation)"); + qWarning("QUmlComponent::realizedInterfaces(): to be implemented (operation)"); Q_UNUSED(classifier); return QSet<QUmlInterface *> (); @@ -367,7 +366,7 @@ QSet<QUmlInterface *> QUmlComponent::realizedInterfaces(QUmlClassifier *classifi */ QSet<QUmlInterface *> QUmlComponent::usedInterfaces(QUmlClassifier *classifier) const { - qWarning("UmlComponent::usedInterfaces(): to be implemented (operation)"); + qWarning("QUmlComponent::usedInterfaces(): to be implemented (operation)"); Q_UNUSED(classifier); return QSet<QUmlInterface *> (); diff --git a/src/uml/qumlconditionalnode.cpp b/src/uml/qumlconditionalnode.cpp index c85413c3..52a6ea5c 100644 --- a/src/uml/qumlconditionalnode.cpp +++ b/src/uml/qumlconditionalnode.cpp @@ -65,7 +65,6 @@ #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> -#include <QtUml/QUmlStructuredActivityNode> #include <QtUml/QUmlVariable> /*! diff --git a/src/uml/qumlconnectableelement.cpp b/src/uml/qumlconnectableelement.cpp index 998282da..f631b3f5 100644 --- a/src/uml/qumlconnectableelement.cpp +++ b/src/uml/qumlconnectableelement.cpp @@ -48,7 +48,6 @@ #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTemplateParameter> #include <QtUml/QUmlType> @@ -94,7 +93,7 @@ const QList<QUmlConnectorEnd *> QUmlConnectableElement::ends() const { // This is a read-only derived association end - qWarning("UmlConnectableElement::ends(): to be implemented (this is a derived association end)"); + qWarning("QUmlConnectableElement::ends(): to be implemented (this is a derived association end)"); return QList<QUmlConnectorEnd *>(); } @@ -103,7 +102,7 @@ void QUmlConnectableElement::addEnd(QUmlConnectorEnd *end) { // This is a read-only derived association end - qWarning("UmlConnectableElement::addEnd(): to be implemented (this is a derived association end)"); + qWarning("QUmlConnectableElement::addEnd(): to be implemented (this is a derived association end)"); Q_UNUSED(end); if (false /* <derivedexclusion-criteria> */) { @@ -120,7 +119,7 @@ void QUmlConnectableElement::removeEnd(QUmlConnectorEnd *end) { // This is a read-only derived association end - qWarning("UmlConnectableElement::removeEnd(): to be implemented (this is a derived association end)"); + qWarning("QUmlConnectableElement::removeEnd(): to be implemented (this is a derived association end)"); Q_UNUSED(end); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlconnectableelement.h b/src/uml/qumlconnectableelement.h index df9664b4..3965254a 100644 --- a/src/uml/qumlconnectableelement.h +++ b/src/uml/qumlconnectableelement.h @@ -58,7 +58,6 @@ class QUmlConnectorEnd; class Q_UML_EXPORT QUmlConnectableElement : public virtual QUmlTypedElement, public QUmlParameterableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlconnector.cpp b/src/uml/qumlconnector.cpp index b5d6ae20..deb0b88c 100644 --- a/src/uml/qumlconnector.cpp +++ b/src/uml/qumlconnector.cpp @@ -171,7 +171,7 @@ QtUml::ConnectorKind QUmlConnector::kind() const { // This is a read-only derived property - qWarning("UmlConnector::kind(): to be implemented (this is a derived property)"); + qWarning("QUmlConnector::kind(): to be implemented (this is a derived property)"); return QtUml::ConnectorKind(); } @@ -180,7 +180,7 @@ void QUmlConnector::setKind(QtUml::ConnectorKind kind) { // This is a read-only derived property - qWarning("UmlConnector::setKind(): to be implemented (this is a derived property)"); + qWarning("QUmlConnector::setKind(): to be implemented (this is a derived property)"); Q_UNUSED(kind); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlconnector.h b/src/uml/qumlconnector.h index 29f3d6c9..9af30042 100644 --- a/src/uml/qumlconnector.h +++ b/src/uml/qumlconnector.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlFeature> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlconnectorend.cpp b/src/uml/qumlconnectorend.cpp index 90b6f3b6..f0388073 100644 --- a/src/uml/qumlconnectorend.cpp +++ b/src/uml/qumlconnectorend.cpp @@ -45,7 +45,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlElement> -#include <QtUml/QUmlMultiplicityElement> #include <QtUml/QUmlProperty> #include <QtUml/QUmlValueSpecification> @@ -91,7 +90,7 @@ QUmlProperty *QUmlConnectorEnd::definingEnd() const { // This is a read-only derived association end - qWarning("UmlConnectorEnd::definingEnd(): to be implemented (this is a derived association end)"); + qWarning("QUmlConnectorEnd::definingEnd(): to be implemented (this is a derived association end)"); return 0; } @@ -100,7 +99,7 @@ void QUmlConnectorEnd::setDefiningEnd(QUmlProperty *definingEnd) { // This is a read-only derived association end - qWarning("UmlConnectorEnd::setDefiningEnd(): to be implemented (this is a derived association end)"); + qWarning("QUmlConnectorEnd::setDefiningEnd(): to be implemented (this is a derived association end)"); Q_UNUSED(definingEnd); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlcontrolflow.cpp b/src/uml/qumlcontrolflow.cpp index 95d122b4..206c15d5 100644 --- a/src/uml/qumlcontrolflow.cpp +++ b/src/uml/qumlcontrolflow.cpp @@ -43,7 +43,6 @@ #include "private/qumlcontrolflowobject_p.h" #include <QtUml/QUmlActivity> -#include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityGroup> #include <QtUml/QUmlActivityNode> #include <QtUml/QUmlActivityPartition> diff --git a/src/uml/qumlcontrolnode.cpp b/src/uml/qumlcontrolnode.cpp index a725cb48..d60c3ceb 100644 --- a/src/uml/qumlcontrolnode.cpp +++ b/src/uml/qumlcontrolnode.cpp @@ -43,7 +43,6 @@ #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityGroup> -#include <QtUml/QUmlActivityNode> #include <QtUml/QUmlActivityPartition> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlComment> diff --git a/src/uml/qumlcontrolnode.h b/src/uml/qumlcontrolnode.h index 44d2c1cb..3261d2ce 100644 --- a/src/uml/qumlcontrolnode.h +++ b/src/uml/qumlcontrolnode.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlControlNode : public QUmlActivityNode { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumldatatype.cpp b/src/uml/qumldatatype.cpp index 76d9fa2a..4bf44005 100644 --- a/src/uml/qumldatatype.cpp +++ b/src/uml/qumldatatype.cpp @@ -42,7 +42,6 @@ #include "private/qumldatatypeobject_p.h" -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> @@ -248,7 +247,7 @@ void QUmlDataType::removeOwnedOperation(QUmlOperation *ownedOperation) */ QSet<QUmlNamedElement *> QUmlDataType::inherit(QSet<QUmlNamedElement *> inhs) const { - qWarning("UmlDataType::inherit(): to be implemented (operation)"); + qWarning("QUmlDataType::inherit(): to be implemented (operation)"); Q_UNUSED(inhs); return QSet<QUmlNamedElement *> (); diff --git a/src/uml/qumldeployedartifact.cpp b/src/uml/qumldeployedartifact.cpp index a69a97cd..f4db174f 100644 --- a/src/uml/qumldeployedartifact.cpp +++ b/src/uml/qumldeployedartifact.cpp @@ -43,7 +43,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumldeployedartifact.h b/src/uml/qumldeployedartifact.h index d3a57664..79791412 100644 --- a/src/uml/qumldeployedartifact.h +++ b/src/uml/qumldeployedartifact.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlDeployedArtifact : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumldeployment.cpp b/src/uml/qumldeployment.cpp index c8700a6f..46998568 100644 --- a/src/uml/qumldeployment.cpp +++ b/src/uml/qumldeployment.cpp @@ -43,7 +43,6 @@ #include "private/qumldeploymentobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlDependency> #include <QtUml/QUmlDeployedArtifact> #include <QtUml/QUmlDeploymentSpecification> #include <QtUml/QUmlDeploymentTarget> diff --git a/src/uml/qumldeploymentspecification.cpp b/src/uml/qumldeploymentspecification.cpp index 83d4632a..c3bebc7d 100644 --- a/src/uml/qumldeploymentspecification.cpp +++ b/src/uml/qumldeploymentspecification.cpp @@ -42,7 +42,6 @@ #include "private/qumldeploymentspecificationobject_p.h" -#include <QtUml/QUmlArtifact> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> diff --git a/src/uml/qumldeploymenttarget.cpp b/src/uml/qumldeploymenttarget.cpp index fe4ddc01..86c046a0 100644 --- a/src/uml/qumldeploymenttarget.cpp +++ b/src/uml/qumldeploymenttarget.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlDependency> #include <QtUml/QUmlDeployment> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> @@ -86,7 +85,7 @@ const QSet<QUmlPackageableElement *> QUmlDeploymentTarget::deployedElements() co { // This is a read-only derived association end - qWarning("UmlDeploymentTarget::deployedElements(): to be implemented (this is a derived association end)"); + qWarning("QUmlDeploymentTarget::deployedElements(): to be implemented (this is a derived association end)"); return QSet<QUmlPackageableElement *>(); } @@ -95,7 +94,7 @@ void QUmlDeploymentTarget::addDeployedElement(QUmlPackageableElement *deployedEl { // This is a read-only derived association end - qWarning("UmlDeploymentTarget::addDeployedElement(): to be implemented (this is a derived association end)"); + qWarning("QUmlDeploymentTarget::addDeployedElement(): to be implemented (this is a derived association end)"); Q_UNUSED(deployedElement); if (false /* <derivedexclusion-criteria> */) { @@ -107,7 +106,7 @@ void QUmlDeploymentTarget::removeDeployedElement(QUmlPackageableElement *deploye { // This is a read-only derived association end - qWarning("UmlDeploymentTarget::removeDeployedElement(): to be implemented (this is a derived association end)"); + qWarning("QUmlDeploymentTarget::removeDeployedElement(): to be implemented (this is a derived association end)"); Q_UNUSED(deployedElement); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumldeploymenttarget.h b/src/uml/qumldeploymenttarget.h index 5df24e51..15286c43 100644 --- a/src/uml/qumldeploymenttarget.h +++ b/src/uml/qumldeploymenttarget.h @@ -57,7 +57,6 @@ class QUmlPackageableElement; class Q_UML_EXPORT QUmlDeploymentTarget : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumldevice.cpp b/src/uml/qumldevice.cpp index bb795711..37ed90b4 100644 --- a/src/uml/qumldevice.cpp +++ b/src/uml/qumldevice.cpp @@ -62,7 +62,6 @@ #include <QtUml/QUmlInterfaceRealization> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> -#include <QtUml/QUmlNode> #include <QtUml/QUmlOperation> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> diff --git a/src/uml/qumldirectedrelationship.h b/src/uml/qumldirectedrelationship.h index 20204ca5..ffd79c4b 100644 --- a/src/uml/qumldirectedrelationship.h +++ b/src/uml/qumldirectedrelationship.h @@ -56,7 +56,6 @@ class QUmlElement; class Q_UML_EXPORT QUmlDirectedRelationship : public QUmlRelationship { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlduration.cpp b/src/uml/qumlduration.cpp index 9edb4c2b..5a73a0ec 100644 --- a/src/uml/qumlduration.cpp +++ b/src/uml/qumlduration.cpp @@ -53,7 +53,6 @@ #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTemplateParameter> #include <QtUml/QUmlType> -#include <QtUml/QUmlValueSpecification> /*! \class QUmlDuration diff --git a/src/uml/qumlelement.h b/src/uml/qumlelement.h index 35a1bae4..7c96102a 100644 --- a/src/uml/qumlelement.h +++ b/src/uml/qumlelement.h @@ -56,7 +56,6 @@ class QUmlComment; class Q_UML_EXPORT QUmlElement : public QModelingElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlelementimport.cpp b/src/uml/qumlelementimport.cpp index 5b9b0df3..9057524e 100644 --- a/src/uml/qumlelementimport.cpp +++ b/src/uml/qumlelementimport.cpp @@ -184,7 +184,7 @@ void QUmlElementImport::setVisibility(QtUml::VisibilityKind visibility) */ QString QUmlElementImport::getName() const { - qWarning("UmlElementImport::getName(): to be implemented (operation)"); + qWarning("QUmlElementImport::getName(): to be implemented (operation)"); return QString (); } diff --git a/src/uml/qumlelementimport.h b/src/uml/qumlelementimport.h index b7da3cc8..cc841c25 100644 --- a/src/uml/qumlelementimport.h +++ b/src/uml/qumlelementimport.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlDirectedRelationship> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlencapsulatedclassifier.cpp b/src/uml/qumlencapsulatedclassifier.cpp index c093f2b4..231be286 100644 --- a/src/uml/qumlencapsulatedclassifier.cpp +++ b/src/uml/qumlencapsulatedclassifier.cpp @@ -144,7 +144,7 @@ const QSet<QUmlPort *> QUmlEncapsulatedClassifier::ownedPorts() const { // This is a read-only derived association end - qWarning("UmlEncapsulatedClassifier::ownedPorts(): to be implemented (this is a derived association end)"); + qWarning("QUmlEncapsulatedClassifier::ownedPorts(): to be implemented (this is a derived association end)"); return QSet<QUmlPort *>(); } @@ -153,7 +153,7 @@ void QUmlEncapsulatedClassifier::addOwnedPort(QUmlPort *ownedPort) { // This is a read-only derived association end - qWarning("UmlEncapsulatedClassifier::addOwnedPort(): to be implemented (this is a derived association end)"); + qWarning("QUmlEncapsulatedClassifier::addOwnedPort(): to be implemented (this is a derived association end)"); Q_UNUSED(ownedPort); if (false /* <derivedexclusion-criteria> */) { @@ -168,7 +168,7 @@ void QUmlEncapsulatedClassifier::removeOwnedPort(QUmlPort *ownedPort) { // This is a read-only derived association end - qWarning("UmlEncapsulatedClassifier::removeOwnedPort(): to be implemented (this is a derived association end)"); + qWarning("QUmlEncapsulatedClassifier::removeOwnedPort(): to be implemented (this is a derived association end)"); Q_UNUSED(ownedPort); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlencapsulatedclassifier.h b/src/uml/qumlencapsulatedclassifier.h index 40a2b5f3..6308bd64 100644 --- a/src/uml/qumlencapsulatedclassifier.h +++ b/src/uml/qumlencapsulatedclassifier.h @@ -56,7 +56,6 @@ class QUmlPort; class Q_UML_EXPORT QUmlEncapsulatedClassifier : public QUmlStructuredClassifier { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlenumerationliteral.cpp b/src/uml/qumlenumerationliteral.cpp index 6e897178..824b735b 100644 --- a/src/uml/qumlenumerationliteral.cpp +++ b/src/uml/qumlenumerationliteral.cpp @@ -108,7 +108,7 @@ QUmlEnumeration *QUmlEnumerationLiteral::classifier() const { // This is a read-only derived association end - qWarning("UmlEnumerationLiteral::classifier(): to be implemented (this is a derived association end)"); + qWarning("QUmlEnumerationLiteral::classifier(): to be implemented (this is a derived association end)"); return 0; } @@ -117,7 +117,7 @@ void QUmlEnumerationLiteral::setClassifier(QUmlEnumeration *classifier) { // This is a read-only derived association end - qWarning("UmlEnumerationLiteral::setClassifier(): to be implemented (this is a derived association end)"); + qWarning("QUmlEnumerationLiteral::setClassifier(): to be implemented (this is a derived association end)"); Q_UNUSED(classifier); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlevent.h b/src/uml/qumlevent.h index b6ed9e3e..aca41d67 100644 --- a/src/uml/qumlevent.h +++ b/src/uml/qumlevent.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlEvent : public QUmlPackageableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlexceptionhandler.cpp b/src/uml/qumlexceptionhandler.cpp index a6850050..7bf6bbf7 100644 --- a/src/uml/qumlexceptionhandler.cpp +++ b/src/uml/qumlexceptionhandler.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlClassifier> #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlExecutableNode> #include <QtUml/QUmlObjectNode> diff --git a/src/uml/qumlexecutablenode.cpp b/src/uml/qumlexecutablenode.cpp index 00bb186f..4313abb1 100644 --- a/src/uml/qumlexecutablenode.cpp +++ b/src/uml/qumlexecutablenode.cpp @@ -43,7 +43,6 @@ #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityGroup> -#include <QtUml/QUmlActivityNode> #include <QtUml/QUmlActivityPartition> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlComment> diff --git a/src/uml/qumlexecutablenode.h b/src/uml/qumlexecutablenode.h index 2acb2e35..ed5c6b56 100644 --- a/src/uml/qumlexecutablenode.h +++ b/src/uml/qumlexecutablenode.h @@ -56,7 +56,6 @@ class QUmlExceptionHandler; class Q_UML_EXPORT QUmlExecutableNode : public QUmlActivityNode { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlexecutionenvironment.cpp b/src/uml/qumlexecutionenvironment.cpp index 787ee675..f5ca2c80 100644 --- a/src/uml/qumlexecutionenvironment.cpp +++ b/src/uml/qumlexecutionenvironment.cpp @@ -62,7 +62,6 @@ #include <QtUml/QUmlInterfaceRealization> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> -#include <QtUml/QUmlNode> #include <QtUml/QUmlOperation> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> diff --git a/src/uml/qumlexecutionspecification.h b/src/uml/qumlexecutionspecification.h index 58da4eda..703856a8 100644 --- a/src/uml/qumlexecutionspecification.h +++ b/src/uml/qumlexecutionspecification.h @@ -56,7 +56,6 @@ class QUmlOccurrenceSpecification; class Q_UML_EXPORT QUmlExecutionSpecification : public QUmlInteractionFragment { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlexpansionregion.cpp b/src/uml/qumlexpansionregion.cpp index 96a282b3..7ea71e09 100644 --- a/src/uml/qumlexpansionregion.cpp +++ b/src/uml/qumlexpansionregion.cpp @@ -65,7 +65,6 @@ #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> -#include <QtUml/QUmlStructuredActivityNode> #include <QtUml/QUmlVariable> /*! diff --git a/src/uml/qumlexpansionregion.h b/src/uml/qumlexpansionregion.h index acccf1f1..29a703e5 100644 --- a/src/uml/qumlexpansionregion.h +++ b/src/uml/qumlexpansionregion.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlStructuredActivityNode> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlexpression.cpp b/src/uml/qumlexpression.cpp index 5a87c1dc..3e4fea46 100644 --- a/src/uml/qumlexpression.cpp +++ b/src/uml/qumlexpression.cpp @@ -52,7 +52,6 @@ #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTemplateParameter> #include <QtUml/QUmlType> -#include <QtUml/QUmlValueSpecification> /*! \class QUmlExpression diff --git a/src/uml/qumlextend.cpp b/src/uml/qumlextend.cpp index 76533c3b..b6ed70bc 100644 --- a/src/uml/qumlextend.cpp +++ b/src/uml/qumlextend.cpp @@ -47,7 +47,6 @@ #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> #include <QtUml/QUmlExtensionPoint> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumlextension.cpp b/src/uml/qumlextension.cpp index 65487532..98824bf2 100644 --- a/src/uml/qumlextension.cpp +++ b/src/uml/qumlextension.cpp @@ -152,7 +152,7 @@ bool QUmlExtension::isRequired() const { // This is a read-only derived property - qWarning("UmlExtension::isRequired(): to be implemented (this is a derived property)"); + qWarning("QUmlExtension::isRequired(): to be implemented (this is a derived property)"); return bool(); } @@ -161,7 +161,7 @@ void QUmlExtension::setRequired(bool isRequired) { // This is a read-only derived property - qWarning("UmlExtension::setRequired(): to be implemented (this is a derived property)"); + qWarning("QUmlExtension::setRequired(): to be implemented (this is a derived property)"); Q_UNUSED(isRequired); if (false /* <derivedexclusion-criteria> */) { @@ -176,7 +176,7 @@ QUmlClass *QUmlExtension::metaclass() const { // This is a read-only derived association end - qWarning("UmlExtension::metaclass(): to be implemented (this is a derived association end)"); + qWarning("QUmlExtension::metaclass(): to be implemented (this is a derived association end)"); return 0; } @@ -185,7 +185,7 @@ void QUmlExtension::setMetaclass(QUmlClass *metaclass) { // This is a read-only derived association end - qWarning("UmlExtension::setMetaclass(): to be implemented (this is a derived association end)"); + qWarning("QUmlExtension::setMetaclass(): to be implemented (this is a derived association end)"); Q_UNUSED(metaclass); if (false /* <derivedexclusion-criteria> */) { @@ -222,7 +222,7 @@ void QUmlExtension::setOwnedEnd(QUmlExtensionEnd *ownedEnd) */ QUmlProperty *QUmlExtension::metaclassEnd() const { - qWarning("UmlExtension::metaclassEnd(): to be implemented (operation)"); + qWarning("QUmlExtension::metaclassEnd(): to be implemented (operation)"); return 0; } diff --git a/src/uml/qumlextensionend.cpp b/src/uml/qumlextensionend.cpp index f98b5b14..172dffe4 100644 --- a/src/uml/qumlextensionend.cpp +++ b/src/uml/qumlextensionend.cpp @@ -59,7 +59,6 @@ #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlParameterableElement> -#include <QtUml/QUmlProperty> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStereotype> #include <QtUml/QUmlStringExpression> @@ -146,7 +145,7 @@ int QUmlExtensionEnd::lower() const { // This is a read-write derived property - qWarning("UmlExtensionEnd::lower(): to be implemented (this is a derived property)"); + qWarning("QUmlExtensionEnd::lower(): to be implemented (this is a derived property)"); return int(); } @@ -155,7 +154,7 @@ void QUmlExtensionEnd::setLower(int lower) { // This is a read-write derived property - qWarning("UmlExtensionEnd::setLower(): to be implemented (this is a derived property)"); + qWarning("QUmlExtensionEnd::setLower(): to be implemented (this is a derived property)"); Q_UNUSED(lower); if (false /* <derivedexclusion-criteria> */) { @@ -191,7 +190,7 @@ void QUmlExtensionEnd::setType(QUmlStereotype *type) */ int QUmlExtensionEnd::lowerBound() const { - qWarning("UmlExtensionEnd::lowerBound(): to be implemented (operation)"); + qWarning("QUmlExtensionEnd::lowerBound(): to be implemented (operation)"); return int (); } diff --git a/src/uml/qumlextensionpoint.cpp b/src/uml/qumlextensionpoint.cpp index 28725857..25f4174f 100644 --- a/src/uml/qumlextensionpoint.cpp +++ b/src/uml/qumlextensionpoint.cpp @@ -49,7 +49,6 @@ #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlUseCase> diff --git a/src/uml/qumlfeature.cpp b/src/uml/qumlfeature.cpp index 67f35f21..670a5c81 100644 --- a/src/uml/qumlfeature.cpp +++ b/src/uml/qumlfeature.cpp @@ -47,7 +47,6 @@ #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> /*! diff --git a/src/uml/qumlfeature.h b/src/uml/qumlfeature.h index e0eb9bac..433cab70 100644 --- a/src/uml/qumlfeature.h +++ b/src/uml/qumlfeature.h @@ -56,7 +56,6 @@ class QUmlClassifier; class Q_UML_EXPORT QUmlFeature : public QUmlRedefinableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlfinalnode.h b/src/uml/qumlfinalnode.h index 9b43a36a..f91602cf 100644 --- a/src/uml/qumlfinalnode.h +++ b/src/uml/qumlfinalnode.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlFinalNode : public QUmlControlNode { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlfinalstate.cpp b/src/uml/qumlfinalstate.cpp index 09e8f457..fb6c9e33 100644 --- a/src/uml/qumlfinalstate.cpp +++ b/src/uml/qumlfinalstate.cpp @@ -58,7 +58,6 @@ #include <QtUml/QUmlPseudostate> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlRegion> -#include <QtUml/QUmlState> #include <QtUml/QUmlStateMachine> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTransition> diff --git a/src/uml/qumlgeneralordering.cpp b/src/uml/qumlgeneralordering.cpp index 6ab2d1e6..9dc515aa 100644 --- a/src/uml/qumlgeneralordering.cpp +++ b/src/uml/qumlgeneralordering.cpp @@ -45,7 +45,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlOccurrenceSpecification> #include <QtUml/QUmlPackage> diff --git a/src/uml/qumlimage.cpp b/src/uml/qumlimage.cpp index 84b3e4ed..1c899a11 100644 --- a/src/uml/qumlimage.cpp +++ b/src/uml/qumlimage.cpp @@ -43,7 +43,6 @@ #include "private/qumlimageobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> /*! \class QUmlImage diff --git a/src/uml/qumlinclude.cpp b/src/uml/qumlinclude.cpp index e8099aff..726a4c72 100644 --- a/src/uml/qumlinclude.cpp +++ b/src/uml/qumlinclude.cpp @@ -45,7 +45,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumlinformationitem.cpp b/src/uml/qumlinformationitem.cpp index 1937033a..f1dda935 100644 --- a/src/uml/qumlinformationitem.cpp +++ b/src/uml/qumlinformationitem.cpp @@ -42,7 +42,6 @@ #include "private/qumlinformationitemobject_p.h" -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> diff --git a/src/uml/qumlinstancespecification.cpp b/src/uml/qumlinstancespecification.cpp index e2b82dd9..a20bdcb5 100644 --- a/src/uml/qumlinstancespecification.cpp +++ b/src/uml/qumlinstancespecification.cpp @@ -50,7 +50,6 @@ #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlSlot> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumlinteraction.cpp b/src/uml/qumlinteraction.cpp index b3575d91..3b28229e 100644 --- a/src/uml/qumlinteraction.cpp +++ b/src/uml/qumlinteraction.cpp @@ -43,7 +43,6 @@ #include "private/qumlinteractionobject_p.h" #include <QtUml/QUmlAction> -#include <QtUml/QUmlBehavior> #include <QtUml/QUmlBehavioralFeature> #include <QtUml/QUmlBehavioredClassifier> #include <QtUml/QUmlClass> @@ -63,7 +62,6 @@ #include <QtUml/QUmlGeneralization> #include <QtUml/QUmlGeneralizationSet> #include <QtUml/QUmlGeneralOrdering> -#include <QtUml/QUmlInteractionFragment> #include <QtUml/QUmlInteractionOperand> #include <QtUml/QUmlInterfaceRealization> #include <QtUml/QUmlLifeline> diff --git a/src/uml/qumlinteractionfragment.cpp b/src/uml/qumlinteractionfragment.cpp index 9b19e899..6d724889 100644 --- a/src/uml/qumlinteractionfragment.cpp +++ b/src/uml/qumlinteractionfragment.cpp @@ -47,7 +47,6 @@ #include <QtUml/QUmlInteraction> #include <QtUml/QUmlInteractionOperand> #include <QtUml/QUmlLifeline> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumlinteractionfragment.h b/src/uml/qumlinteractionfragment.h index a125d3a7..42692422 100644 --- a/src/uml/qumlinteractionfragment.h +++ b/src/uml/qumlinteractionfragment.h @@ -59,7 +59,6 @@ class QUmlLifeline; class Q_UML_EXPORT QUmlInteractionFragment : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlinteractionoperand.cpp b/src/uml/qumlinteractionoperand.cpp index 67ce2500..c5b05d11 100644 --- a/src/uml/qumlinteractionoperand.cpp +++ b/src/uml/qumlinteractionoperand.cpp @@ -50,10 +50,8 @@ #include <QtUml/QUmlGeneralOrdering> #include <QtUml/QUmlInteraction> #include <QtUml/QUmlInteractionConstraint> -#include <QtUml/QUmlInteractionFragment> #include <QtUml/QUmlLifeline> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> diff --git a/src/uml/qumlinterface.cpp b/src/uml/qumlinterface.cpp index cd41ffec..8f93d1c6 100644 --- a/src/uml/qumlinterface.cpp +++ b/src/uml/qumlinterface.cpp @@ -42,7 +42,6 @@ #include "private/qumlinterfaceobject_p.h" -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> diff --git a/src/uml/qumlinterruptibleactivityregion.cpp b/src/uml/qumlinterruptibleactivityregion.cpp index 9bf1fbf8..b8d6ad3a 100644 --- a/src/uml/qumlinterruptibleactivityregion.cpp +++ b/src/uml/qumlinterruptibleactivityregion.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> -#include <QtUml/QUmlActivityGroup> #include <QtUml/QUmlActivityNode> #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> diff --git a/src/uml/qumlinterval.cpp b/src/uml/qumlinterval.cpp index 65d52b3c..e9b463a0 100644 --- a/src/uml/qumlinterval.cpp +++ b/src/uml/qumlinterval.cpp @@ -52,7 +52,6 @@ #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTemplateParameter> #include <QtUml/QUmlType> -#include <QtUml/QUmlValueSpecification> /*! \class QUmlInterval diff --git a/src/uml/qumlinvocationaction.h b/src/uml/qumlinvocationaction.h index b19ee80e..d06bfea3 100644 --- a/src/uml/qumlinvocationaction.h +++ b/src/uml/qumlinvocationaction.h @@ -57,7 +57,6 @@ class QUmlPort; class Q_UML_EXPORT QUmlInvocationAction : public QUmlAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumllifeline.cpp b/src/uml/qumllifeline.cpp index 0c44f7bd..f169fccb 100644 --- a/src/uml/qumllifeline.cpp +++ b/src/uml/qumllifeline.cpp @@ -48,7 +48,6 @@ #include <QtUml/QUmlElement> #include <QtUml/QUmlInteraction> #include <QtUml/QUmlInteractionFragment> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPartDecomposition> diff --git a/src/uml/qumllinkaction.cpp b/src/uml/qumllinkaction.cpp index d5592bba..86fcec85 100644 --- a/src/uml/qumllinkaction.cpp +++ b/src/uml/qumllinkaction.cpp @@ -201,7 +201,7 @@ void QUmlLinkAction::removeInputValue(QUmlInputPin *inputValue) */ QUmlAssociation *QUmlLinkAction::association() const { - qWarning("UmlLinkAction::association(): to be implemented (operation)"); + qWarning("QUmlLinkAction::association(): to be implemented (operation)"); return 0; } diff --git a/src/uml/qumllinkaction.h b/src/uml/qumllinkaction.h index c55d5cec..31c71b03 100644 --- a/src/uml/qumllinkaction.h +++ b/src/uml/qumllinkaction.h @@ -58,7 +58,6 @@ class QUmlLinkEndData; class Q_UML_EXPORT QUmlLinkAction : public QUmlAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumllinkenddata.cpp b/src/uml/qumllinkenddata.cpp index 45178370..e9be5707 100644 --- a/src/uml/qumllinkenddata.cpp +++ b/src/uml/qumllinkenddata.cpp @@ -43,7 +43,6 @@ #include "private/qumllinkenddataobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlInputPin> #include <QtUml/QUmlProperty> #include <QtUml/QUmlQualifierValue> diff --git a/src/uml/qumlliteralboolean.cpp b/src/uml/qumlliteralboolean.cpp index 08ffb852..ad332758 100644 --- a/src/uml/qumlliteralboolean.cpp +++ b/src/uml/qumlliteralboolean.cpp @@ -117,7 +117,7 @@ void QUmlLiteralBoolean::setValue(bool value) */ bool QUmlLiteralBoolean::booleanValue() const { - qWarning("UmlLiteralBoolean::booleanValue(): to be implemented (operation)"); + qWarning("QUmlLiteralBoolean::booleanValue(): to be implemented (operation)"); return bool (); } @@ -127,7 +127,7 @@ bool QUmlLiteralBoolean::booleanValue() const */ bool QUmlLiteralBoolean::isComputable() const { - qWarning("UmlLiteralBoolean::isComputable(): to be implemented (operation)"); + qWarning("QUmlLiteralBoolean::isComputable(): to be implemented (operation)"); return bool (); } diff --git a/src/uml/qumlliteralinteger.cpp b/src/uml/qumlliteralinteger.cpp index 07a317e6..0b59e5af 100644 --- a/src/uml/qumlliteralinteger.cpp +++ b/src/uml/qumlliteralinteger.cpp @@ -117,7 +117,7 @@ void QUmlLiteralInteger::setValue(int value) */ int QUmlLiteralInteger::integerValue() const { - qWarning("UmlLiteralInteger::integerValue(): to be implemented (operation)"); + qWarning("QUmlLiteralInteger::integerValue(): to be implemented (operation)"); return int (); } @@ -127,7 +127,7 @@ int QUmlLiteralInteger::integerValue() const */ bool QUmlLiteralInteger::isComputable() const { - qWarning("UmlLiteralInteger::isComputable(): to be implemented (operation)"); + qWarning("QUmlLiteralInteger::isComputable(): to be implemented (operation)"); return bool (); } diff --git a/src/uml/qumlliteralnull.cpp b/src/uml/qumlliteralnull.cpp index 99777621..520cece7 100644 --- a/src/uml/qumlliteralnull.cpp +++ b/src/uml/qumlliteralnull.cpp @@ -93,7 +93,7 @@ QModelingElement *QUmlLiteralNull::clone() const */ bool QUmlLiteralNull::isComputable() const { - qWarning("UmlLiteralNull::isComputable(): to be implemented (operation)"); + qWarning("QUmlLiteralNull::isComputable(): to be implemented (operation)"); return bool (); } @@ -103,7 +103,7 @@ bool QUmlLiteralNull::isComputable() const */ bool QUmlLiteralNull::isNull() const { - qWarning("UmlLiteralNull::isNull(): to be implemented (operation)"); + qWarning("QUmlLiteralNull::isNull(): to be implemented (operation)"); return bool (); } diff --git a/src/uml/qumlliteralreal.cpp b/src/uml/qumlliteralreal.cpp index aadbdb92..70b1ce74 100644 --- a/src/uml/qumlliteralreal.cpp +++ b/src/uml/qumlliteralreal.cpp @@ -89,6 +89,7 @@ QModelingElement *QUmlLiteralReal::clone() const // OWNED ATTRIBUTES + double QUmlLiteralReal::value() const { // This is a read-write property @@ -112,7 +113,7 @@ void QUmlLiteralReal::setValue(double value) */ bool QUmlLiteralReal::isComputable() const { - qWarning("UmlLiteralReal::isComputable(): to be implemented (operation)"); + qWarning("QUmlLiteralReal::isComputable(): to be implemented (operation)"); return bool (); } @@ -122,7 +123,7 @@ bool QUmlLiteralReal::isComputable() const */ double QUmlLiteralReal::realValue() const { - qWarning("UmlLiteralReal::realValue(): to be implemented (operation)"); + qWarning("QUmlLiteralReal::realValue(): to be implemented (operation)"); return double (); } diff --git a/src/uml/qumlliteralspecification.h b/src/uml/qumlliteralspecification.h index f88c40f5..03fe3a50 100644 --- a/src/uml/qumlliteralspecification.h +++ b/src/uml/qumlliteralspecification.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlLiteralSpecification : public QUmlValueSpecification { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlliteralstring.cpp b/src/uml/qumlliteralstring.cpp index 097509ed..7f27feed 100644 --- a/src/uml/qumlliteralstring.cpp +++ b/src/uml/qumlliteralstring.cpp @@ -115,7 +115,7 @@ void QUmlLiteralString::setValue(QString value) */ bool QUmlLiteralString::isComputable() const { - qWarning("UmlLiteralString::isComputable(): to be implemented (operation)"); + qWarning("QUmlLiteralString::isComputable(): to be implemented (operation)"); return bool (); } @@ -125,7 +125,7 @@ bool QUmlLiteralString::isComputable() const */ QString QUmlLiteralString::stringValue() const { - qWarning("UmlLiteralString::stringValue(): to be implemented (operation)"); + qWarning("QUmlLiteralString::stringValue(): to be implemented (operation)"); return QString (); } diff --git a/src/uml/qumlliteralunlimitednatural.cpp b/src/uml/qumlliteralunlimitednatural.cpp index 2f5e5c27..5b9d3cdd 100644 --- a/src/uml/qumlliteralunlimitednatural.cpp +++ b/src/uml/qumlliteralunlimitednatural.cpp @@ -117,7 +117,7 @@ void QUmlLiteralUnlimitedNatural::setValue(int value) */ bool QUmlLiteralUnlimitedNatural::isComputable() const { - qWarning("UmlLiteralUnlimitedNatural::isComputable(): to be implemented (operation)"); + qWarning("QUmlLiteralUnlimitedNatural::isComputable(): to be implemented (operation)"); return bool (); } @@ -127,7 +127,7 @@ bool QUmlLiteralUnlimitedNatural::isComputable() const */ int QUmlLiteralUnlimitedNatural::unlimitedValue() const { - qWarning("UmlLiteralUnlimitedNatural::unlimitedValue(): to be implemented (operation)"); + qWarning("QUmlLiteralUnlimitedNatural::unlimitedValue(): to be implemented (operation)"); return int (); } diff --git a/src/uml/qumlloopnode.cpp b/src/uml/qumlloopnode.cpp index 892286ce..a217be14 100644 --- a/src/uml/qumlloopnode.cpp +++ b/src/uml/qumlloopnode.cpp @@ -65,7 +65,6 @@ #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> -#include <QtUml/QUmlStructuredActivityNode> #include <QtUml/QUmlVariable> /*! diff --git a/src/uml/qumlmessage.cpp b/src/uml/qumlmessage.cpp index 17b72b96..b4bf37c7 100644 --- a/src/uml/qumlmessage.cpp +++ b/src/uml/qumlmessage.cpp @@ -48,7 +48,6 @@ #include <QtUml/QUmlElement> #include <QtUml/QUmlInteraction> #include <QtUml/QUmlMessageEnd> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> @@ -195,7 +194,7 @@ QtUml::MessageKind QUmlMessage::messageKind() const { // This is a read-only derived property - qWarning("UmlMessage::messageKind(): to be implemented (this is a derived property)"); + qWarning("QUmlMessage::messageKind(): to be implemented (this is a derived property)"); return QtUml::MessageKind(); } @@ -204,7 +203,7 @@ void QUmlMessage::setMessageKind(QtUml::MessageKind messageKind) { // This is a read-only derived property - qWarning("UmlMessage::setMessageKind(): to be implemented (this is a derived property)"); + qWarning("QUmlMessage::setMessageKind(): to be implemented (this is a derived property)"); Q_UNUSED(messageKind); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlmessage.h b/src/uml/qumlmessage.h index 83a820bc..29e305a2 100644 --- a/src/uml/qumlmessage.h +++ b/src/uml/qumlmessage.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlNamedElement> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlmessageend.cpp b/src/uml/qumlmessageend.cpp index 289dfd12..1041291b 100644 --- a/src/uml/qumlmessageend.cpp +++ b/src/uml/qumlmessageend.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> #include <QtUml/QUmlMessage> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumlmessageend.h b/src/uml/qumlmessageend.h index f41432ab..de78c5d6 100644 --- a/src/uml/qumlmessageend.h +++ b/src/uml/qumlmessageend.h @@ -56,7 +56,6 @@ class QUmlMessage; class Q_UML_EXPORT QUmlMessageEnd : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlmessageevent.h b/src/uml/qumlmessageevent.h index 5fcec0aa..a28162c1 100644 --- a/src/uml/qumlmessageevent.h +++ b/src/uml/qumlmessageevent.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlMessageEvent : public QUmlEvent { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlmodel.cpp b/src/uml/qumlmodel.cpp index 74346ceb..a3dec5f2 100644 --- a/src/uml/qumlmodel.cpp +++ b/src/uml/qumlmodel.cpp @@ -49,7 +49,6 @@ #include <QtUml/QUmlElementImport> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> -#include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlPackageMerge> diff --git a/src/uml/qumlmultiplicityelement.cpp b/src/uml/qumlmultiplicityelement.cpp index 97a05d5d..af37938b 100644 --- a/src/uml/qumlmultiplicityelement.cpp +++ b/src/uml/qumlmultiplicityelement.cpp @@ -41,7 +41,6 @@ #include "qumlmultiplicityelement.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlValueSpecification> /*! @@ -122,7 +121,7 @@ int QUmlMultiplicityElement::lower() const { // This is a read-write derived property - qWarning("UmlMultiplicityElement::lower(): to be implemented (this is a derived property)"); + qWarning("QUmlMultiplicityElement::lower(): to be implemented (this is a derived property)"); return int(); } @@ -131,7 +130,7 @@ void QUmlMultiplicityElement::setLower(int lower) { // This is a read-write derived property - qWarning("UmlMultiplicityElement::setLower(): to be implemented (this is a derived property)"); + qWarning("QUmlMultiplicityElement::setLower(): to be implemented (this is a derived property)"); Q_UNUSED(lower); if (false /* <derivedexclusion-criteria> */) { @@ -176,7 +175,7 @@ int QUmlMultiplicityElement::upper() const { // This is a read-write derived property - qWarning("UmlMultiplicityElement::upper(): to be implemented (this is a derived property)"); + qWarning("QUmlMultiplicityElement::upper(): to be implemented (this is a derived property)"); return int(); } @@ -185,7 +184,7 @@ void QUmlMultiplicityElement::setUpper(int upper) { // This is a read-write derived property - qWarning("UmlMultiplicityElement::setUpper(): to be implemented (this is a derived property)"); + qWarning("QUmlMultiplicityElement::setUpper(): to be implemented (this is a derived property)"); Q_UNUSED(upper); if (false /* <derivedexclusion-criteria> */) { @@ -230,7 +229,7 @@ void QUmlMultiplicityElement::setUpperValue(QUmlValueSpecification *upperValue) */ bool QUmlMultiplicityElement::compatibleWith(QUmlMultiplicityElement *other) const { - qWarning("UmlMultiplicityElement::compatibleWith(): to be implemented (operation)"); + qWarning("QUmlMultiplicityElement::compatibleWith(): to be implemented (operation)"); Q_UNUSED(other); return bool (); @@ -241,7 +240,7 @@ bool QUmlMultiplicityElement::compatibleWith(QUmlMultiplicityElement *other) con */ bool QUmlMultiplicityElement::includesCardinality(int C) const { - qWarning("UmlMultiplicityElement::includesCardinality(): to be implemented (operation)"); + qWarning("QUmlMultiplicityElement::includesCardinality(): to be implemented (operation)"); Q_UNUSED(C); return bool (); @@ -252,7 +251,7 @@ bool QUmlMultiplicityElement::includesCardinality(int C) const */ bool QUmlMultiplicityElement::includesMultiplicity(QUmlMultiplicityElement *M) const { - qWarning("UmlMultiplicityElement::includesMultiplicity(): to be implemented (operation)"); + qWarning("QUmlMultiplicityElement::includesMultiplicity(): to be implemented (operation)"); Q_UNUSED(M); return bool (); @@ -263,7 +262,7 @@ bool QUmlMultiplicityElement::includesMultiplicity(QUmlMultiplicityElement *M) c */ bool QUmlMultiplicityElement::is(int lowerbound, int upperbound) const { - qWarning("UmlMultiplicityElement::is(): to be implemented (operation)"); + qWarning("QUmlMultiplicityElement::is(): to be implemented (operation)"); Q_UNUSED(lowerbound); Q_UNUSED(upperbound); @@ -275,7 +274,7 @@ bool QUmlMultiplicityElement::is(int lowerbound, int upperbound) const */ bool QUmlMultiplicityElement::isMultivalued() const { - qWarning("UmlMultiplicityElement::isMultivalued(): to be implemented (operation)"); + qWarning("QUmlMultiplicityElement::isMultivalued(): to be implemented (operation)"); return bool (); } @@ -285,7 +284,7 @@ bool QUmlMultiplicityElement::isMultivalued() const */ int QUmlMultiplicityElement::lowerBound() const { - qWarning("UmlMultiplicityElement::lowerBound(): to be implemented (operation)"); + qWarning("QUmlMultiplicityElement::lowerBound(): to be implemented (operation)"); return int (); } @@ -295,7 +294,7 @@ int QUmlMultiplicityElement::lowerBound() const */ //int QUmlMultiplicityElement::upperBound() const //{ -// qWarning("UmlMultiplicityElement::upperBound(): to be implemented (operation)"); +// qWarning("QUmlMultiplicityElement::upperBound(): to be implemented (operation)"); // // return int (); //} diff --git a/src/uml/qumlmultiplicityelement.h b/src/uml/qumlmultiplicityelement.h index 7aee5a73..b3e5734d 100644 --- a/src/uml/qumlmultiplicityelement.h +++ b/src/uml/qumlmultiplicityelement.h @@ -56,7 +56,6 @@ class QUmlValueSpecification; class Q_UML_EXPORT QUmlMultiplicityElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlnamedelement.cpp b/src/uml/qumlnamedelement.cpp index 5a44166e..ecfae270 100644 --- a/src/uml/qumlnamedelement.cpp +++ b/src/uml/qumlnamedelement.cpp @@ -42,7 +42,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> -#include <QtUml/QUmlElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> @@ -215,7 +214,7 @@ void QUmlNamedElement::setQualifiedName(QString qualifiedName) { // This is a read-only derived property - qWarning("UmlNamedElement::setQualifiedName(): to be implemented (this is a derived property)"); + qWarning("QUmlNamedElement::setQualifiedName(): to be implemented (this is a derived property)"); Q_UNUSED(qualifiedName); if (false /* <derivedexclusion-criteria> */) { @@ -268,7 +267,7 @@ QList<QUmlNamespace *> QUmlNamedElement::allNamespaces() const */ QSet<QUmlPackage *> QUmlNamedElement::allOwningPackages() const { - qWarning("UmlNamedElement::allOwningPackages(): to be implemented (operation)"); + qWarning("QUmlNamedElement::allOwningPackages(): to be implemented (operation)"); return QSet<QUmlPackage *> (); } @@ -278,7 +277,7 @@ QSet<QUmlPackage *> QUmlNamedElement::allOwningPackages() const */ bool QUmlNamedElement::isDistinguishableFrom(QUmlNamedElement *n, QUmlNamespace *ns) const { - qWarning("UmlNamedElement::isDistinguishableFrom(): to be implemented (operation)"); + qWarning("QUmlNamedElement::isDistinguishableFrom(): to be implemented (operation)"); Q_UNUSED(n); Q_UNUSED(ns); diff --git a/src/uml/qumlnamedelement.h b/src/uml/qumlnamedelement.h index 95a8a031..cb36e834 100644 --- a/src/uml/qumlnamedelement.h +++ b/src/uml/qumlnamedelement.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlElement> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -61,7 +61,6 @@ class QUmlStringExpression; class Q_UML_EXPORT QUmlNamedElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlnamespace.cpp b/src/uml/qumlnamespace.cpp index 0f375db4..10193363 100644 --- a/src/uml/qumlnamespace.cpp +++ b/src/uml/qumlnamespace.cpp @@ -45,7 +45,6 @@ #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> #include <QtUml/QUmlElementImport> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> @@ -153,7 +152,7 @@ void QUmlNamespace::addImportedMember(QUmlPackageableElement *importedMember) { // This is a read-only derived association end - qWarning("UmlNamespace::addImportedMember(): to be implemented (this is a derived association end)"); + qWarning("QUmlNamespace::addImportedMember(): to be implemented (this is a derived association end)"); Q_UNUSED(importedMember); if (false /* <derivedexclusion-criteria> */) { @@ -168,7 +167,7 @@ void QUmlNamespace::removeImportedMember(QUmlPackageableElement *importedMember) { // This is a read-only derived association end - qWarning("UmlNamespace::removeImportedMember(): to be implemented (this is a derived association end)"); + qWarning("QUmlNamespace::removeImportedMember(): to be implemented (this is a derived association end)"); Q_UNUSED(importedMember); if (false /* <derivedexclusion-criteria> */) { @@ -365,7 +364,7 @@ void QUmlNamespace::removePackageImport(QUmlPackageImport *packageImport) */ QSet<QUmlPackageableElement *> QUmlNamespace::excludeCollisions(QSet<QUmlPackageableElement *> imps) const { - qWarning("UmlNamespace::excludeCollisions(): to be implemented (operation)"); + qWarning("QUmlNamespace::excludeCollisions(): to be implemented (operation)"); Q_UNUSED(imps); return QSet<QUmlPackageableElement *> (); @@ -376,7 +375,7 @@ QSet<QUmlPackageableElement *> QUmlNamespace::excludeCollisions(QSet<QUmlPackage */ QSet<QString> QUmlNamespace::getNamesOfMember(QUmlNamedElement *element) const { - qWarning("UmlNamespace::getNamesOfMember(): to be implemented (operation)"); + qWarning("QUmlNamespace::getNamesOfMember(): to be implemented (operation)"); Q_UNUSED(element); return QSet<QString> (); @@ -387,7 +386,7 @@ QSet<QString> QUmlNamespace::getNamesOfMember(QUmlNamedElement *element) const */ QSet<QUmlPackageableElement *> QUmlNamespace::importMembers(QSet<QUmlPackageableElement *> imps) const { - qWarning("UmlNamespace::importMembers(): to be implemented (operation)"); + qWarning("QUmlNamespace::importMembers(): to be implemented (operation)"); Q_UNUSED(imps); return QSet<QUmlPackageableElement *> (); @@ -398,7 +397,7 @@ QSet<QUmlPackageableElement *> QUmlNamespace::importMembers(QSet<QUmlPackageable */ bool QUmlNamespace::membersAreDistinguishable() const { - qWarning("UmlNamespace::membersAreDistinguishable(): to be implemented (operation)"); + qWarning("QUmlNamespace::membersAreDistinguishable(): to be implemented (operation)"); return bool (); } diff --git a/src/uml/qumlnamespace.h b/src/uml/qumlnamespace.h index 7959c084..83ee641c 100644 --- a/src/uml/qumlnamespace.h +++ b/src/uml/qumlnamespace.h @@ -59,7 +59,6 @@ class QUmlPackageImport; class Q_UML_EXPORT QUmlNamespace : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlnode.cpp b/src/uml/qumlnode.cpp index 4ba175d4..b1cbe66c 100644 --- a/src/uml/qumlnode.cpp +++ b/src/uml/qumlnode.cpp @@ -43,7 +43,6 @@ #include "private/qumlnodeobject_p.h" #include <QtUml/QUmlBehavior> -#include <QtUml/QUmlClass> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> diff --git a/src/uml/qumlobjectflow.cpp b/src/uml/qumlobjectflow.cpp index dc01bc62..f0d3a37e 100644 --- a/src/uml/qumlobjectflow.cpp +++ b/src/uml/qumlobjectflow.cpp @@ -43,7 +43,6 @@ #include "private/qumlobjectflowobject_p.h" #include <QtUml/QUmlActivity> -#include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityGroup> #include <QtUml/QUmlActivityNode> #include <QtUml/QUmlActivityPartition> diff --git a/src/uml/qumlobjectnode.cpp b/src/uml/qumlobjectnode.cpp index 1f207b65..f413dd66 100644 --- a/src/uml/qumlobjectnode.cpp +++ b/src/uml/qumlobjectnode.cpp @@ -43,7 +43,6 @@ #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> #include <QtUml/QUmlActivityGroup> -#include <QtUml/QUmlActivityNode> #include <QtUml/QUmlActivityPartition> #include <QtUml/QUmlBehavior> #include <QtUml/QUmlClassifier> diff --git a/src/uml/qumlobjectnode.h b/src/uml/qumlobjectnode.h index 74b6323d..8f611594 100644 --- a/src/uml/qumlobjectnode.h +++ b/src/uml/qumlobjectnode.h @@ -46,8 +46,8 @@ #include <QtUml/QUmlActivityNode> #include <QtUml/QUmlTypedElement> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -61,7 +61,6 @@ class QUmlValueSpecification; class Q_UML_EXPORT QUmlObjectNode : public QUmlActivityNode, public QUmlTypedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlobservation.h b/src/uml/qumlobservation.h index 736e8338..e15a468f 100644 --- a/src/uml/qumlobservation.h +++ b/src/uml/qumlobservation.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlObservation : public QUmlPackageableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlopaquebehavior.cpp b/src/uml/qumlopaquebehavior.cpp index 7ce0e4e0..a33cbdcf 100644 --- a/src/uml/qumlopaquebehavior.cpp +++ b/src/uml/qumlopaquebehavior.cpp @@ -42,7 +42,6 @@ #include "private/qumlopaquebehaviorobject_p.h" -#include <QtUml/QUmlBehavior> #include <QtUml/QUmlBehavioralFeature> #include <QtUml/QUmlBehavioredClassifier> #include <QtUml/QUmlClass> diff --git a/src/uml/qumlopaqueexpression.cpp b/src/uml/qumlopaqueexpression.cpp index d955a434..09381da7 100644 --- a/src/uml/qumlopaqueexpression.cpp +++ b/src/uml/qumlopaqueexpression.cpp @@ -181,7 +181,7 @@ QUmlParameter *QUmlOpaqueExpression::result() const { // This is a read-only derived association end - qWarning("UmlOpaqueExpression::result(): to be implemented (this is a derived association end)"); + qWarning("QUmlOpaqueExpression::result(): to be implemented (this is a derived association end)"); return 0; } @@ -190,7 +190,7 @@ void QUmlOpaqueExpression::setResult(QUmlParameter *result) { // This is a read-only derived association end - qWarning("UmlOpaqueExpression::setResult(): to be implemented (this is a derived association end)"); + qWarning("QUmlOpaqueExpression::setResult(): to be implemented (this is a derived association end)"); Q_UNUSED(result); if (false /* <derivedexclusion-criteria> */) { @@ -205,7 +205,7 @@ void QUmlOpaqueExpression::setResult(QUmlParameter *result) */ bool QUmlOpaqueExpression::isIntegral() const { - qWarning("UmlOpaqueExpression::isIntegral(): to be implemented (operation)"); + qWarning("QUmlOpaqueExpression::isIntegral(): to be implemented (operation)"); return bool (); } @@ -215,7 +215,7 @@ bool QUmlOpaqueExpression::isIntegral() const */ bool QUmlOpaqueExpression::isNonNegative() const { - qWarning("UmlOpaqueExpression::isNonNegative(): to be implemented (operation)"); + qWarning("QUmlOpaqueExpression::isNonNegative(): to be implemented (operation)"); return bool (); } @@ -225,7 +225,7 @@ bool QUmlOpaqueExpression::isNonNegative() const */ bool QUmlOpaqueExpression::isPositive() const { - qWarning("UmlOpaqueExpression::isPositive(): to be implemented (operation)"); + qWarning("QUmlOpaqueExpression::isPositive(): to be implemented (operation)"); return bool (); } @@ -235,7 +235,7 @@ bool QUmlOpaqueExpression::isPositive() const */ int QUmlOpaqueExpression::value() const { - qWarning("UmlOpaqueExpression::value(): to be implemented (operation)"); + qWarning("QUmlOpaqueExpression::value(): to be implemented (operation)"); return int (); } diff --git a/src/uml/qumloperation.cpp b/src/uml/qumloperation.cpp index d49401ee..6f808f6c 100644 --- a/src/uml/qumloperation.cpp +++ b/src/uml/qumloperation.cpp @@ -59,7 +59,6 @@ #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlParameter> -#include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlParameterSet> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> @@ -283,7 +282,7 @@ bool QUmlOperation::isOrdered() const { // This is a read-only derived property - qWarning("UmlOperation::isOrdered(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::isOrdered(): to be implemented (this is a derived property)"); return bool(); } @@ -292,7 +291,7 @@ void QUmlOperation::setOrdered(bool isOrdered) { // This is a read-only derived property - qWarning("UmlOperation::setOrdered(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::setOrdered(): to be implemented (this is a derived property)"); Q_UNUSED(isOrdered); if (false /* <derivedexclusion-criteria> */) { @@ -327,7 +326,7 @@ bool QUmlOperation::isUnique() const { // This is a read-only derived property - qWarning("UmlOperation::isUnique(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::isUnique(): to be implemented (this is a derived property)"); return bool(); } @@ -336,7 +335,7 @@ void QUmlOperation::setUnique(bool isUnique) { // This is a read-only derived property - qWarning("UmlOperation::setUnique(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::setUnique(): to be implemented (this is a derived property)"); Q_UNUSED(isUnique); if (false /* <derivedexclusion-criteria> */) { @@ -351,7 +350,7 @@ int QUmlOperation::lower() const { // This is a read-only derived property - qWarning("UmlOperation::lower(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::lower(): to be implemented (this is a derived property)"); return int(); } @@ -360,7 +359,7 @@ void QUmlOperation::setLower(int lower) { // This is a read-only derived property - qWarning("UmlOperation::setLower(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::setLower(): to be implemented (this is a derived property)"); Q_UNUSED(lower); if (false /* <derivedexclusion-criteria> */) { @@ -583,7 +582,7 @@ QUmlType *QUmlOperation::type() const { // This is a read-only derived association end - qWarning("UmlOperation::type(): to be implemented (this is a derived association end)"); + qWarning("QUmlOperation::type(): to be implemented (this is a derived association end)"); return 0; } @@ -592,7 +591,7 @@ void QUmlOperation::setType(QUmlType *type) { // This is a read-only derived association end - qWarning("UmlOperation::setType(): to be implemented (this is a derived association end)"); + qWarning("QUmlOperation::setType(): to be implemented (this is a derived association end)"); Q_UNUSED(type); if (false /* <derivedexclusion-criteria> */) { @@ -607,7 +606,7 @@ int QUmlOperation::upper() const { // This is a read-only derived property - qWarning("UmlOperation::upper(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::upper(): to be implemented (this is a derived property)"); return int(); } @@ -616,7 +615,7 @@ void QUmlOperation::setUpper(int upper) { // This is a read-only derived property - qWarning("UmlOperation::setUpper(): to be implemented (this is a derived property)"); + qWarning("QUmlOperation::setUpper(): to be implemented (this is a derived property)"); Q_UNUSED(upper); if (false /* <derivedexclusion-criteria> */) { @@ -631,7 +630,7 @@ void QUmlOperation::setUpper(int upper) */ bool QUmlOperation::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlOperation::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlOperation::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); @@ -642,7 +641,7 @@ bool QUmlOperation::isConsistentWith(QUmlRedefinableElement *redefinee) const */ QSet<QUmlParameter *> QUmlOperation::returnResult() const { - qWarning("UmlOperation::returnResult(): to be implemented (operation)"); + qWarning("QUmlOperation::returnResult(): to be implemented (operation)"); return QSet<QUmlParameter *> (); } diff --git a/src/uml/qumlpackage.cpp b/src/uml/qumlpackage.cpp index 4e56435a..3958cdf2 100644 --- a/src/uml/qumlpackage.cpp +++ b/src/uml/qumlpackage.cpp @@ -48,8 +48,6 @@ #include <QtUml/QUmlElement> #include <QtUml/QUmlElementImport> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> -#include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlPackageMerge> #include <QtUml/QUmlParameterableElement> @@ -213,7 +211,7 @@ void QUmlPackage::addOwnedStereotype(QUmlStereotype *ownedStereotype) { // This is a read-only derived association end - qWarning("UmlPackage::addOwnedStereotype(): to be implemented (this is a derived association end)"); + qWarning("QUmlPackage::addOwnedStereotype(): to be implemented (this is a derived association end)"); Q_UNUSED(ownedStereotype); if (false /* <derivedexclusion-criteria> */) { @@ -228,7 +226,7 @@ void QUmlPackage::removeOwnedStereotype(QUmlStereotype *ownedStereotype) { // This is a read-only derived association end - qWarning("UmlPackage::removeOwnedStereotype(): to be implemented (this is a derived association end)"); + qWarning("QUmlPackage::removeOwnedStereotype(): to be implemented (this is a derived association end)"); Q_UNUSED(ownedStereotype); if (false /* <derivedexclusion-criteria> */) { @@ -425,7 +423,7 @@ void QUmlPackage::removeProfileApplication(QUmlProfileApplication *profileApplic */ QSet<QUmlStereotype *> QUmlPackage::allApplicableStereotypes() const { - qWarning("UmlPackage::allApplicableStereotypes(): to be implemented (operation)"); + qWarning("QUmlPackage::allApplicableStereotypes(): to be implemented (operation)"); return QSet<QUmlStereotype *> (); } @@ -435,7 +433,7 @@ QSet<QUmlStereotype *> QUmlPackage::allApplicableStereotypes() const */ QUmlProfile *QUmlPackage::containingProfile() const { - qWarning("UmlPackage::containingProfile(): to be implemented (operation)"); + qWarning("QUmlPackage::containingProfile(): to be implemented (operation)"); return 0; } @@ -445,7 +443,7 @@ QUmlProfile *QUmlPackage::containingProfile() const */ bool QUmlPackage::makesVisible(QUmlNamedElement *el) const { - qWarning("UmlPackage::makesVisible(): to be implemented (operation)"); + qWarning("QUmlPackage::makesVisible(): to be implemented (operation)"); Q_UNUSED(el); return bool (); @@ -456,7 +454,7 @@ bool QUmlPackage::makesVisible(QUmlNamedElement *el) const */ bool QUmlPackage::mustBeOwned() const { - qWarning("UmlPackage::mustBeOwned(): to be implemented (operation)"); + qWarning("QUmlPackage::mustBeOwned(): to be implemented (operation)"); return bool (); } @@ -466,7 +464,7 @@ bool QUmlPackage::mustBeOwned() const */ QSet<QUmlPackageableElement *> QUmlPackage::visibleMembers() const { - qWarning("UmlPackage::visibleMembers(): to be implemented (operation)"); + qWarning("QUmlPackage::visibleMembers(): to be implemented (operation)"); return QSet<QUmlPackageableElement *> (); } diff --git a/src/uml/qumlpackageableelement.cpp b/src/uml/qumlpackageableelement.cpp index d16cca87..d1800da3 100644 --- a/src/uml/qumlpackageableelement.cpp +++ b/src/uml/qumlpackageableelement.cpp @@ -43,10 +43,8 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTemplateParameter> diff --git a/src/uml/qumlpackageableelement.h b/src/uml/qumlpackageableelement.h index 1fe10270..050274e2 100644 --- a/src/uml/qumlpackageableelement.h +++ b/src/uml/qumlpackageableelement.h @@ -46,8 +46,8 @@ #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlNamedElement> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -57,7 +57,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlPackageableElement : public QUmlParameterableElement, public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlpackageimport.h b/src/uml/qumlpackageimport.h index 30644cde..9684125e 100644 --- a/src/uml/qumlpackageimport.h +++ b/src/uml/qumlpackageimport.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlDirectedRelationship> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlparameter.cpp b/src/uml/qumlparameter.cpp index 54bed8b2..a3863e37 100644 --- a/src/uml/qumlparameter.cpp +++ b/src/uml/qumlparameter.cpp @@ -47,7 +47,6 @@ #include <QtUml/QUmlConnectorEnd> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlMultiplicityElement> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlOperation> @@ -122,7 +121,7 @@ QString QUmlParameter::default_() const { // This is a read-write derived property - qWarning("UmlParameter::default_(): to be implemented (this is a derived property)"); + qWarning("QUmlParameter::default_(): to be implemented (this is a derived property)"); return QString(); } @@ -131,7 +130,7 @@ void QUmlParameter::setDefault(QString default_) { // This is a read-write derived property - qWarning("UmlParameter::setDefault(): to be implemented (this is a derived property)"); + qWarning("QUmlParameter::setDefault(): to be implemented (this is a derived property)"); Q_UNUSED(default_); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlparameter.h b/src/uml/qumlparameter.h index 482f62cf..e7ee4b08 100644 --- a/src/uml/qumlparameter.h +++ b/src/uml/qumlparameter.h @@ -46,8 +46,8 @@ #include <QtUml/QUmlMultiplicityElement> #include <QtUml/QUmlConnectableElement> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlparameterableelement.cpp b/src/uml/qumlparameterableelement.cpp index 2840d23f..4372020d 100644 --- a/src/uml/qumlparameterableelement.cpp +++ b/src/uml/qumlparameterableelement.cpp @@ -41,7 +41,6 @@ #include "qumlparameterableelement.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlTemplateParameter> /*! @@ -126,7 +125,7 @@ void QUmlParameterableElement::setTemplateParameter(QUmlTemplateParameter *templ */ bool QUmlParameterableElement::isCompatibleWith(QUmlParameterableElement *p) const { - qWarning("UmlParameterableElement::isCompatibleWith(): to be implemented (operation)"); + qWarning("QUmlParameterableElement::isCompatibleWith(): to be implemented (operation)"); Q_UNUSED(p); return bool (); @@ -137,7 +136,7 @@ bool QUmlParameterableElement::isCompatibleWith(QUmlParameterableElement *p) con */ bool QUmlParameterableElement::isTemplateParameter() const { - qWarning("UmlParameterableElement::isTemplateParameter(): to be implemented (operation)"); + qWarning("QUmlParameterableElement::isTemplateParameter(): to be implemented (operation)"); return bool (); } diff --git a/src/uml/qumlparameterableelement.h b/src/uml/qumlparameterableelement.h index eaf574c6..0f501b81 100644 --- a/src/uml/qumlparameterableelement.h +++ b/src/uml/qumlparameterableelement.h @@ -56,7 +56,6 @@ class QUmlTemplateParameter; class Q_UML_EXPORT QUmlParameterableElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlparameterset.cpp b/src/uml/qumlparameterset.cpp index c4ab7505..038e7c25 100644 --- a/src/uml/qumlparameterset.cpp +++ b/src/uml/qumlparameterset.cpp @@ -46,7 +46,6 @@ #include <QtUml/QUmlConstraint> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlParameter> diff --git a/src/uml/qumlpin.cpp b/src/uml/qumlpin.cpp index 100b975f..7a5accb8 100644 --- a/src/uml/qumlpin.cpp +++ b/src/uml/qumlpin.cpp @@ -51,7 +51,6 @@ #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> #include <QtUml/QUmlInterruptibleActivityRegion> -#include <QtUml/QUmlMultiplicityElement> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> diff --git a/src/uml/qumlpin.h b/src/uml/qumlpin.h index 54c9f03d..38277fe8 100644 --- a/src/uml/qumlpin.h +++ b/src/uml/qumlpin.h @@ -55,7 +55,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlPin : public QUmlMultiplicityElement, public QUmlObjectNode { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlport.cpp b/src/uml/qumlport.cpp index 6622c1b2..6fca06d3 100644 --- a/src/uml/qumlport.cpp +++ b/src/uml/qumlport.cpp @@ -59,7 +59,6 @@ #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlParameterableElement> -#include <QtUml/QUmlProperty> #include <QtUml/QUmlProtocolStateMachine> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> @@ -237,7 +236,7 @@ const QSet<QUmlInterface *> QUmlPort::provided() const { // This is a read-only derived association end - qWarning("UmlPort::provided(): to be implemented (this is a derived association end)"); + qWarning("QUmlPort::provided(): to be implemented (this is a derived association end)"); return QSet<QUmlInterface *>(); } @@ -246,7 +245,7 @@ void QUmlPort::addProvided(QUmlInterface *provided) { // This is a read-only derived association end - qWarning("UmlPort::addProvided(): to be implemented (this is a derived association end)"); + qWarning("QUmlPort::addProvided(): to be implemented (this is a derived association end)"); Q_UNUSED(provided); if (false /* <derivedexclusion-criteria> */) { @@ -258,7 +257,7 @@ void QUmlPort::removeProvided(QUmlInterface *provided) { // This is a read-only derived association end - qWarning("UmlPort::removeProvided(): to be implemented (this is a derived association end)"); + qWarning("QUmlPort::removeProvided(): to be implemented (this is a derived association end)"); Q_UNUSED(provided); if (false /* <derivedexclusion-criteria> */) { @@ -309,7 +308,7 @@ const QSet<QUmlInterface *> QUmlPort::required() const { // This is a read-only derived association end - qWarning("UmlPort::required(): to be implemented (this is a derived association end)"); + qWarning("QUmlPort::required(): to be implemented (this is a derived association end)"); return QSet<QUmlInterface *>(); } @@ -318,7 +317,7 @@ void QUmlPort::addRequired(QUmlInterface *required) { // This is a read-only derived association end - qWarning("UmlPort::addRequired(): to be implemented (this is a derived association end)"); + qWarning("QUmlPort::addRequired(): to be implemented (this is a derived association end)"); Q_UNUSED(required); if (false /* <derivedexclusion-criteria> */) { @@ -330,7 +329,7 @@ void QUmlPort::removeRequired(QUmlInterface *required) { // This is a read-only derived association end - qWarning("UmlPort::removeRequired(): to be implemented (this is a derived association end)"); + qWarning("QUmlPort::removeRequired(): to be implemented (this is a derived association end)"); Q_UNUSED(required); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlprofile.cpp b/src/uml/qumlprofile.cpp index c170c8c7..26d27c7b 100644 --- a/src/uml/qumlprofile.cpp +++ b/src/uml/qumlprofile.cpp @@ -49,7 +49,6 @@ #include <QtUml/QUmlElementImport> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> -#include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlPackageMerge> diff --git a/src/uml/qumlproperty.cpp b/src/uml/qumlproperty.cpp index d9c8e9d1..570bfdcd 100644 --- a/src/uml/qumlproperty.cpp +++ b/src/uml/qumlproperty.cpp @@ -273,7 +273,7 @@ QString QUmlProperty::default_() const { // This is a read-write derived property - qWarning("UmlProperty::default_(): to be implemented (this is a derived property)"); + qWarning("QUmlProperty::default_(): to be implemented (this is a derived property)"); return QString(); } @@ -282,7 +282,7 @@ void QUmlProperty::setDefault(QString default_) { // This is a read-write derived property - qWarning("UmlProperty::setDefault(): to be implemented (this is a derived property)"); + qWarning("QUmlProperty::setDefault(): to be implemented (this is a derived property)"); Q_UNUSED(default_); if (false /* <derivedexclusion-criteria> */) { @@ -353,7 +353,7 @@ bool QUmlProperty::isComposite() const { // This is a read-write derived property - qWarning("UmlProperty::isComposite(): to be implemented (this is a derived property)"); + qWarning("QUmlProperty::isComposite(): to be implemented (this is a derived property)"); return bool(); } @@ -362,7 +362,7 @@ void QUmlProperty::setComposite(bool isComposite) { // This is a read-write derived property - qWarning("UmlProperty::setComposite(): to be implemented (this is a derived property)"); + qWarning("QUmlProperty::setComposite(): to be implemented (this is a derived property)"); Q_UNUSED(isComposite); if (false /* <derivedexclusion-criteria> */) { @@ -457,7 +457,7 @@ QUmlProperty *QUmlProperty::opposite() const { // This is a read-write derived association end - qWarning("UmlProperty::opposite(): to be implemented (this is a derived association end)"); + qWarning("QUmlProperty::opposite(): to be implemented (this is a derived association end)"); return 0; } @@ -466,7 +466,7 @@ void QUmlProperty::setOpposite(QUmlProperty *opposite) { // This is a read-write derived association end - qWarning("UmlProperty::setOpposite(): to be implemented (this is a derived association end)"); + qWarning("QUmlProperty::setOpposite(): to be implemented (this is a derived association end)"); Q_UNUSED(opposite); if (false /* <derivedexclusion-criteria> */) { @@ -621,7 +621,7 @@ void QUmlProperty::removeSubsettedProperty(QUmlProperty *subsettedProperty) */ bool QUmlProperty::isAttribute(QUmlProperty *p) const { - qWarning("UmlProperty::isAttribute(): to be implemented (operation)"); + qWarning("QUmlProperty::isAttribute(): to be implemented (operation)"); Q_UNUSED(p); return bool (); @@ -632,7 +632,7 @@ bool QUmlProperty::isAttribute(QUmlProperty *p) const */ bool QUmlProperty::isCompatibleWith(QUmlParameterableElement *p) const { - qWarning("UmlProperty::isCompatibleWith(): to be implemented (operation)"); + qWarning("QUmlProperty::isCompatibleWith(): to be implemented (operation)"); Q_UNUSED(p); return bool (); @@ -643,7 +643,7 @@ bool QUmlProperty::isCompatibleWith(QUmlParameterableElement *p) const */ bool QUmlProperty::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlProperty::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlProperty::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); @@ -654,7 +654,7 @@ bool QUmlProperty::isConsistentWith(QUmlRedefinableElement *redefinee) const */ bool QUmlProperty::isNavigable() const { - qWarning("UmlProperty::isNavigable(): to be implemented (operation)"); + qWarning("QUmlProperty::isNavigable(): to be implemented (operation)"); return bool (); } @@ -664,7 +664,7 @@ bool QUmlProperty::isNavigable() const */ QSet<QUmlType *> QUmlProperty::subsettingContext() const { - qWarning("UmlProperty::subsettingContext(): to be implemented (operation)"); + qWarning("QUmlProperty::subsettingContext(): to be implemented (operation)"); return QSet<QUmlType *> (); } diff --git a/src/uml/qumlproperty.h b/src/uml/qumlproperty.h index 3e8ca90b..720867f3 100644 --- a/src/uml/qumlproperty.h +++ b/src/uml/qumlproperty.h @@ -47,8 +47,8 @@ #include <QtUml/QUmlConnectableElement> #include <QtUml/QUmlDeploymentTarget> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlprotocolstatemachine.cpp b/src/uml/qumlprotocolstatemachine.cpp index 40e4654c..933de837 100644 --- a/src/uml/qumlprotocolstatemachine.cpp +++ b/src/uml/qumlprotocolstatemachine.cpp @@ -79,7 +79,6 @@ #include <QtUml/QUmlRedefinableTemplateSignature> #include <QtUml/QUmlRegion> #include <QtUml/QUmlState> -#include <QtUml/QUmlStateMachine> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlSubstitution> #include <QtUml/QUmlTemplateBinding> diff --git a/src/uml/qumlprotocoltransition.cpp b/src/uml/qumlprotocoltransition.cpp index f686586a..de278b61 100644 --- a/src/uml/qumlprotocoltransition.cpp +++ b/src/uml/qumlprotocoltransition.cpp @@ -59,7 +59,6 @@ #include <QtUml/QUmlRegion> #include <QtUml/QUmlStateMachine> #include <QtUml/QUmlStringExpression> -#include <QtUml/QUmlTransition> #include <QtUml/QUmlTrigger> #include <QtUml/QUmlVertex> @@ -185,7 +184,7 @@ const QSet<QUmlOperation *> QUmlProtocolTransition::referred() const { // This is a read-only derived association end - qWarning("UmlProtocolTransition::referred(): to be implemented (this is a derived association end)"); + qWarning("QUmlProtocolTransition::referred(): to be implemented (this is a derived association end)"); return QSet<QUmlOperation *>(); } @@ -194,7 +193,7 @@ void QUmlProtocolTransition::addReferred(QUmlOperation *referred) { // This is a read-only derived association end - qWarning("UmlProtocolTransition::addReferred(): to be implemented (this is a derived association end)"); + qWarning("QUmlProtocolTransition::addReferred(): to be implemented (this is a derived association end)"); Q_UNUSED(referred); if (false /* <derivedexclusion-criteria> */) { @@ -206,7 +205,7 @@ void QUmlProtocolTransition::removeReferred(QUmlOperation *referred) { // This is a read-only derived association end - qWarning("UmlProtocolTransition::removeReferred(): to be implemented (this is a derived association end)"); + qWarning("QUmlProtocolTransition::removeReferred(): to be implemented (this is a derived association end)"); Q_UNUSED(referred); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlpseudostate.h b/src/uml/qumlpseudostate.h index 4aedf3fe..f49ddc06 100644 --- a/src/uml/qumlpseudostate.h +++ b/src/uml/qumlpseudostate.h @@ -45,8 +45,8 @@ #include <QtUml/QUmlVertex> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumlqualifiervalue.cpp b/src/uml/qumlqualifiervalue.cpp index 79862390..ef50cf9f 100644 --- a/src/uml/qumlqualifiervalue.cpp +++ b/src/uml/qumlqualifiervalue.cpp @@ -43,7 +43,6 @@ #include "private/qumlqualifiervalueobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlInputPin> #include <QtUml/QUmlProperty> diff --git a/src/uml/qumlredefinableelement.cpp b/src/uml/qumlredefinableelement.cpp index 2bec01fb..9bb9238c 100644 --- a/src/uml/qumlredefinableelement.cpp +++ b/src/uml/qumlredefinableelement.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> @@ -165,7 +164,7 @@ void QUmlRedefinableElement::removeRedefinitionContext(QUmlClassifier *redefinit */ bool QUmlRedefinableElement::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlRedefinableElement::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlRedefinableElement::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); @@ -176,7 +175,7 @@ bool QUmlRedefinableElement::isConsistentWith(QUmlRedefinableElement *redefinee) */ bool QUmlRedefinableElement::isRedefinitionContextValid(QUmlRedefinableElement *redefined) const { - qWarning("UmlRedefinableElement::isRedefinitionContextValid(): to be implemented (operation)"); + qWarning("QUmlRedefinableElement::isRedefinitionContextValid(): to be implemented (operation)"); Q_UNUSED(redefined); return bool (); diff --git a/src/uml/qumlredefinableelement.h b/src/uml/qumlredefinableelement.h index 789984e4..66619212 100644 --- a/src/uml/qumlredefinableelement.h +++ b/src/uml/qumlredefinableelement.h @@ -56,7 +56,6 @@ class QUmlClassifier; class Q_UML_EXPORT QUmlRedefinableElement : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlredefinabletemplatesignature.cpp b/src/uml/qumlredefinabletemplatesignature.cpp index defce5a1..3cbcc1f3 100644 --- a/src/uml/qumlredefinabletemplatesignature.cpp +++ b/src/uml/qumlredefinabletemplatesignature.cpp @@ -49,7 +49,6 @@ #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTemplateableElement> #include <QtUml/QUmlTemplateParameter> @@ -168,7 +167,7 @@ const QSet<QUmlTemplateParameter *> QUmlRedefinableTemplateSignature::inheritedP { // This is a read-only derived association end - qWarning("UmlRedefinableTemplateSignature::inheritedParameters(): to be implemented (this is a derived association end)"); + qWarning("QUmlRedefinableTemplateSignature::inheritedParameters(): to be implemented (this is a derived association end)"); return QSet<QUmlTemplateParameter *>(); } @@ -177,7 +176,7 @@ void QUmlRedefinableTemplateSignature::addInheritedParameter(QUmlTemplateParamet { // This is a read-only derived association end - qWarning("UmlRedefinableTemplateSignature::addInheritedParameter(): to be implemented (this is a derived association end)"); + qWarning("QUmlRedefinableTemplateSignature::addInheritedParameter(): to be implemented (this is a derived association end)"); Q_UNUSED(inheritedParameter); if (false /* <derivedexclusion-criteria> */) { @@ -192,7 +191,7 @@ void QUmlRedefinableTemplateSignature::removeInheritedParameter(QUmlTemplatePara { // This is a read-only derived association end - qWarning("UmlRedefinableTemplateSignature::removeInheritedParameter(): to be implemented (this is a derived association end)"); + qWarning("QUmlRedefinableTemplateSignature::removeInheritedParameter(): to be implemented (this is a derived association end)"); Q_UNUSED(inheritedParameter); if (false /* <derivedexclusion-criteria> */) { @@ -210,7 +209,7 @@ void QUmlRedefinableTemplateSignature::removeInheritedParameter(QUmlTemplatePara */ bool QUmlRedefinableTemplateSignature::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlRedefinableTemplateSignature::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlRedefinableTemplateSignature::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); diff --git a/src/uml/qumlregion.cpp b/src/uml/qumlregion.cpp index f986b9b4..193f0012 100644 --- a/src/uml/qumlregion.cpp +++ b/src/uml/qumlregion.cpp @@ -49,11 +49,9 @@ #include <QtUml/QUmlElement> #include <QtUml/QUmlElementImport> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlState> #include <QtUml/QUmlStateMachine> #include <QtUml/QUmlStringExpression> @@ -145,7 +143,7 @@ QUmlClassifier *QUmlRegion::redefinitionContext() const { // This is a read-only derived association end - qWarning("UmlRegion::redefinitionContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlRegion::redefinitionContext(): to be implemented (this is a derived association end)"); return 0; } @@ -154,7 +152,7 @@ void QUmlRegion::setRedefinitionContext(QUmlClassifier *redefinitionContext) { // This is a read-only derived association end - qWarning("UmlRegion::setRedefinitionContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlRegion::setRedefinitionContext(): to be implemented (this is a derived association end)"); Q_UNUSED(redefinitionContext); if (false /* <derivedexclusion-criteria> */) { @@ -319,7 +317,7 @@ void QUmlRegion::removeTransition(QUmlTransition *transition) */ bool QUmlRegion::belongsToPSM() const { - qWarning("UmlRegion::belongsToPSM(): to be implemented (operation)"); + qWarning("QUmlRegion::belongsToPSM(): to be implemented (operation)"); return bool (); } @@ -329,7 +327,7 @@ bool QUmlRegion::belongsToPSM() const */ QUmlStateMachine *QUmlRegion::containingStateMachine() const { - qWarning("UmlRegion::containingStateMachine(): to be implemented (operation)"); + qWarning("QUmlRegion::containingStateMachine(): to be implemented (operation)"); return 0; } @@ -339,7 +337,7 @@ QUmlStateMachine *QUmlRegion::containingStateMachine() const */ bool QUmlRegion::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlRegion::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlRegion::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); @@ -350,7 +348,7 @@ bool QUmlRegion::isConsistentWith(QUmlRedefinableElement *redefinee) const */ bool QUmlRegion::isRedefinitionContextValid(QUmlRegion *redefined) const { - qWarning("UmlRegion::isRedefinitionContextValid(): to be implemented (operation)"); + qWarning("QUmlRegion::isRedefinitionContextValid(): to be implemented (operation)"); Q_UNUSED(redefined); return bool (); diff --git a/src/uml/qumlrelationship.cpp b/src/uml/qumlrelationship.cpp index 1786b36e..f8e94e4d 100644 --- a/src/uml/qumlrelationship.cpp +++ b/src/uml/qumlrelationship.cpp @@ -41,7 +41,6 @@ #include "qumlrelationship.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> /*! \class QUmlRelationship diff --git a/src/uml/qumlrelationship.h b/src/uml/qumlrelationship.h index 78eb93b0..d2f08b0b 100644 --- a/src/uml/qumlrelationship.h +++ b/src/uml/qumlrelationship.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlRelationship : public virtual QUmlElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlsequencenode.cpp b/src/uml/qumlsequencenode.cpp index 2c67ad83..abd43e9f 100644 --- a/src/uml/qumlsequencenode.cpp +++ b/src/uml/qumlsequencenode.cpp @@ -65,7 +65,6 @@ #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlStringExpression> -#include <QtUml/QUmlStructuredActivityNode> #include <QtUml/QUmlVariable> /*! diff --git a/src/uml/qumlsignal.cpp b/src/uml/qumlsignal.cpp index 51f25e74..5a5cbef5 100644 --- a/src/uml/qumlsignal.cpp +++ b/src/uml/qumlsignal.cpp @@ -42,7 +42,6 @@ #include "private/qumlsignalobject_p.h" -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> diff --git a/src/uml/qumlslot.cpp b/src/uml/qumlslot.cpp index 59ba2d0c..3ba78e5e 100644 --- a/src/uml/qumlslot.cpp +++ b/src/uml/qumlslot.cpp @@ -43,7 +43,6 @@ #include "private/qumlslotobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlInstanceSpecification> #include <QtUml/QUmlStructuralFeature> #include <QtUml/QUmlValueSpecification> diff --git a/src/uml/qumlstate.cpp b/src/uml/qumlstate.cpp index a4899027..ec4bbcde 100644 --- a/src/uml/qumlstate.cpp +++ b/src/uml/qumlstate.cpp @@ -51,12 +51,10 @@ #include <QtUml/QUmlElement> #include <QtUml/QUmlElementImport> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> #include <QtUml/QUmlPseudostate> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlRegion> #include <QtUml/QUmlStateMachine> #include <QtUml/QUmlStringExpression> @@ -361,7 +359,7 @@ bool QUmlState::isComposite() const { // This is a read-only derived property - qWarning("UmlState::isComposite(): to be implemented (this is a derived property)"); + qWarning("QUmlState::isComposite(): to be implemented (this is a derived property)"); return bool(); } @@ -370,7 +368,7 @@ void QUmlState::setComposite(bool isComposite) { // This is a read-only derived property - qWarning("UmlState::setComposite(): to be implemented (this is a derived property)"); + qWarning("QUmlState::setComposite(): to be implemented (this is a derived property)"); Q_UNUSED(isComposite); if (false /* <derivedexclusion-criteria> */) { @@ -385,7 +383,7 @@ bool QUmlState::isOrthogonal() const { // This is a read-only derived property - qWarning("UmlState::isOrthogonal(): to be implemented (this is a derived property)"); + qWarning("QUmlState::isOrthogonal(): to be implemented (this is a derived property)"); return bool(); } @@ -394,7 +392,7 @@ void QUmlState::setOrthogonal(bool isOrthogonal) { // This is a read-only derived property - qWarning("UmlState::setOrthogonal(): to be implemented (this is a derived property)"); + qWarning("QUmlState::setOrthogonal(): to be implemented (this is a derived property)"); Q_UNUSED(isOrthogonal); if (false /* <derivedexclusion-criteria> */) { @@ -409,7 +407,7 @@ bool QUmlState::isSimple() const { // This is a read-only derived property - qWarning("UmlState::isSimple(): to be implemented (this is a derived property)"); + qWarning("QUmlState::isSimple(): to be implemented (this is a derived property)"); return bool(); } @@ -418,7 +416,7 @@ void QUmlState::setSimple(bool isSimple) { // This is a read-only derived property - qWarning("UmlState::setSimple(): to be implemented (this is a derived property)"); + qWarning("QUmlState::setSimple(): to be implemented (this is a derived property)"); Q_UNUSED(isSimple); if (false /* <derivedexclusion-criteria> */) { @@ -433,7 +431,7 @@ bool QUmlState::isSubmachineState() const { // This is a read-only derived property - qWarning("UmlState::isSubmachineState(): to be implemented (this is a derived property)"); + qWarning("QUmlState::isSubmachineState(): to be implemented (this is a derived property)"); return bool(); } @@ -442,7 +440,7 @@ void QUmlState::setSubmachineState(bool isSubmachineState) { // This is a read-only derived property - qWarning("UmlState::setSubmachineState(): to be implemented (this is a derived property)"); + qWarning("QUmlState::setSubmachineState(): to be implemented (this is a derived property)"); Q_UNUSED(isSubmachineState); if (false /* <derivedexclusion-criteria> */) { @@ -486,7 +484,7 @@ QUmlClassifier *QUmlState::redefinitionContext() const { // This is a read-only derived association end - qWarning("UmlState::redefinitionContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlState::redefinitionContext(): to be implemented (this is a derived association end)"); return 0; } @@ -495,7 +493,7 @@ void QUmlState::setRedefinitionContext(QUmlClassifier *redefinitionContext) { // This is a read-only derived association end - qWarning("UmlState::setRedefinitionContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlState::setRedefinitionContext(): to be implemented (this is a derived association end)"); Q_UNUSED(redefinitionContext); if (false /* <derivedexclusion-criteria> */) { @@ -610,7 +608,7 @@ void QUmlState::setSubmachine(QUmlStateMachine *submachine) */ QUmlStateMachine *QUmlState::containingStateMachine() const { - qWarning("UmlState::containingStateMachine(): to be implemented (operation)"); + qWarning("QUmlState::containingStateMachine(): to be implemented (operation)"); return 0; } @@ -620,7 +618,7 @@ QUmlStateMachine *QUmlState::containingStateMachine() const */ bool QUmlState::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlState::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlState::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); @@ -631,7 +629,7 @@ bool QUmlState::isConsistentWith(QUmlRedefinableElement *redefinee) const */ bool QUmlState::isRedefinitionContextValid(QUmlState *redefined) const { - qWarning("UmlState::isRedefinitionContextValid(): to be implemented (operation)"); + qWarning("QUmlState::isRedefinitionContextValid(): to be implemented (operation)"); Q_UNUSED(redefined); return bool (); diff --git a/src/uml/qumlstatemachine.cpp b/src/uml/qumlstatemachine.cpp index 553da208..de638fce 100644 --- a/src/uml/qumlstatemachine.cpp +++ b/src/uml/qumlstatemachine.cpp @@ -42,7 +42,6 @@ #include "private/qumlstatemachineobject_p.h" -#include <QtUml/QUmlBehavior> #include <QtUml/QUmlBehavioralFeature> #include <QtUml/QUmlBehavioredClassifier> #include <QtUml/QUmlClass> @@ -361,7 +360,7 @@ void QUmlStateMachine::removeSubmachineState(QUmlState *submachineState) */ QUmlNamespace *QUmlStateMachine::LCA(QUmlState *s1, QUmlState *s2) const { - qWarning("UmlStateMachine::LCA(): to be implemented (operation)"); + qWarning("QUmlStateMachine::LCA(): to be implemented (operation)"); Q_UNUSED(s1); Q_UNUSED(s2); @@ -373,7 +372,7 @@ QUmlNamespace *QUmlStateMachine::LCA(QUmlState *s1, QUmlState *s2) const */ bool QUmlStateMachine::ancestor(QUmlState *s1, QUmlState *s2) const { - qWarning("UmlStateMachine::ancestor(): to be implemented (operation)"); + qWarning("QUmlStateMachine::ancestor(): to be implemented (operation)"); Q_UNUSED(s1); Q_UNUSED(s2); @@ -385,7 +384,7 @@ bool QUmlStateMachine::ancestor(QUmlState *s1, QUmlState *s2) const */ bool QUmlStateMachine::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlStateMachine::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlStateMachine::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); @@ -396,7 +395,7 @@ bool QUmlStateMachine::isConsistentWith(QUmlRedefinableElement *redefinee) const */ bool QUmlStateMachine::isRedefinitionContextValid(QUmlStateMachine *redefined) const { - qWarning("UmlStateMachine::isRedefinitionContextValid(): to be implemented (operation)"); + qWarning("QUmlStateMachine::isRedefinitionContextValid(): to be implemented (operation)"); Q_UNUSED(redefined); return bool (); diff --git a/src/uml/qumlstereotype.cpp b/src/uml/qumlstereotype.cpp index 2b1669d7..0595e880 100644 --- a/src/uml/qumlstereotype.cpp +++ b/src/uml/qumlstereotype.cpp @@ -43,7 +43,6 @@ #include "private/qumlstereotypeobject_p.h" #include <QtUml/QUmlBehavior> -#include <QtUml/QUmlClass> #include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> @@ -211,7 +210,7 @@ QUmlProfile *QUmlStereotype::profile() const { // This is a read-only derived association end - qWarning("UmlStereotype::profile(): to be implemented (this is a derived association end)"); + qWarning("QUmlStereotype::profile(): to be implemented (this is a derived association end)"); return 0; } @@ -220,7 +219,7 @@ void QUmlStereotype::setProfile(QUmlProfile *profile) { // This is a read-only derived association end - qWarning("UmlStereotype::setProfile(): to be implemented (this is a derived association end)"); + qWarning("QUmlStereotype::setProfile(): to be implemented (this is a derived association end)"); Q_UNUSED(profile); if (false /* <derivedexclusion-criteria> */) { @@ -235,7 +234,7 @@ void QUmlStereotype::setProfile(QUmlProfile *profile) */ QUmlProfile *QUmlStereotype::containingProfile() const { - qWarning("UmlStereotype::containingProfile(): to be implemented (operation)"); + qWarning("QUmlStereotype::containingProfile(): to be implemented (operation)"); return 0; } diff --git a/src/uml/qumlstringexpression.cpp b/src/uml/qumlstringexpression.cpp index 7aff6672..386f5baa 100644 --- a/src/uml/qumlstringexpression.cpp +++ b/src/uml/qumlstringexpression.cpp @@ -175,7 +175,7 @@ void QUmlStringExpression::removeSubExpression(QUmlStringExpression *subExpressi */ QString QUmlStringExpression::stringValue() const { - qWarning("UmlStringExpression::stringValue(): to be implemented (operation)"); + qWarning("QUmlStringExpression::stringValue(): to be implemented (operation)"); return QString (); } diff --git a/src/uml/qumlstructuralfeature.cpp b/src/uml/qumlstructuralfeature.cpp index fe6076a5..dbf3edbf 100644 --- a/src/uml/qumlstructuralfeature.cpp +++ b/src/uml/qumlstructuralfeature.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlMultiplicityElement> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> diff --git a/src/uml/qumlstructuralfeature.h b/src/uml/qumlstructuralfeature.h index 97d6cd02..d4db0447 100644 --- a/src/uml/qumlstructuralfeature.h +++ b/src/uml/qumlstructuralfeature.h @@ -56,7 +56,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlStructuralFeature : public virtual QUmlTypedElement, public QUmlMultiplicityElement, public QUmlFeature { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlstructuralfeatureaction.h b/src/uml/qumlstructuralfeatureaction.h index 8662e8d3..272b84f7 100644 --- a/src/uml/qumlstructuralfeatureaction.h +++ b/src/uml/qumlstructuralfeatureaction.h @@ -57,7 +57,6 @@ class QUmlStructuralFeature; class Q_UML_EXPORT QUmlStructuralFeatureAction : public QUmlAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlstructuredactivitynode.cpp b/src/uml/qumlstructuredactivitynode.cpp index c5e8d828..22da2113 100644 --- a/src/uml/qumlstructuredactivitynode.cpp +++ b/src/uml/qumlstructuredactivitynode.cpp @@ -44,7 +44,6 @@ #include <QtUml/QUmlActivity> #include <QtUml/QUmlActivityEdge> -#include <QtUml/QUmlActivityGroup> #include <QtUml/QUmlActivityNode> #include <QtUml/QUmlActivityPartition> #include <QtUml/QUmlClassifier> @@ -57,7 +56,6 @@ #include <QtUml/QUmlInputPin> #include <QtUml/QUmlInterruptibleActivityRegion> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> #include <QtUml/QUmlOutputPin> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> @@ -279,6 +277,7 @@ void QUmlStructuredActivityNode::removeNode(QUmlActivityNode *node) } } + const QSet<QUmlInputPin *> QUmlStructuredActivityNode::structuredNodeInputs() const { // This is a read-write association end @@ -315,6 +314,7 @@ void QUmlStructuredActivityNode::removeStructuredNodeInput(QUmlInputPin *structu } } + const QSet<QUmlOutputPin *> QUmlStructuredActivityNode::structuredNodeOutputs() const { // This is a read-write association end diff --git a/src/uml/qumlstructuredclassifier.cpp b/src/uml/qumlstructuredclassifier.cpp index 4c1758b6..32a2ca5e 100644 --- a/src/uml/qumlstructuredclassifier.cpp +++ b/src/uml/qumlstructuredclassifier.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "qumlstructuredclassifier.h" -#include <QtUml/QUmlClassifier> #include <QtUml/QUmlClassifierTemplateParameter> #include <QtUml/QUmlCollaborationUse> #include <QtUml/QUmlComment> @@ -227,7 +226,7 @@ const QSet<QUmlProperty *> QUmlStructuredClassifier::parts() const { // This is a read-only derived association end - qWarning("UmlStructuredClassifier::parts(): to be implemented (this is a derived association end)"); + qWarning("QUmlStructuredClassifier::parts(): to be implemented (this is a derived association end)"); return QSet<QUmlProperty *>(); } @@ -236,7 +235,7 @@ void QUmlStructuredClassifier::addPart(QUmlProperty *part) { // This is a read-only derived association end - qWarning("UmlStructuredClassifier::addPart(): to be implemented (this is a derived association end)"); + qWarning("QUmlStructuredClassifier::addPart(): to be implemented (this is a derived association end)"); Q_UNUSED(part); if (false /* <derivedexclusion-criteria> */) { @@ -248,7 +247,7 @@ void QUmlStructuredClassifier::removePart(QUmlProperty *part) { // This is a read-only derived association end - qWarning("UmlStructuredClassifier::removePart(): to be implemented (this is a derived association end)"); + qWarning("QUmlStructuredClassifier::removePart(): to be implemented (this is a derived association end)"); Q_UNUSED(part); if (false /* <derivedexclusion-criteria> */) { diff --git a/src/uml/qumlstructuredclassifier.h b/src/uml/qumlstructuredclassifier.h index 7c10b119..f2226f63 100644 --- a/src/uml/qumlstructuredclassifier.h +++ b/src/uml/qumlstructuredclassifier.h @@ -58,7 +58,6 @@ class QUmlProperty; class Q_UML_EXPORT QUmlStructuredClassifier : public virtual QUmlClassifier { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumltemplateableelement.cpp b/src/uml/qumltemplateableelement.cpp index 03e4342c..06e16861 100644 --- a/src/uml/qumltemplateableelement.cpp +++ b/src/uml/qumltemplateableelement.cpp @@ -41,7 +41,6 @@ #include "qumltemplateableelement.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateBinding> #include <QtUml/QUmlTemplateSignature> @@ -158,7 +157,7 @@ void QUmlTemplateableElement::removeTemplateBinding(QUmlTemplateBinding *templat */ bool QUmlTemplateableElement::isTemplate() const { - qWarning("UmlTemplateableElement::isTemplate(): to be implemented (operation)"); + qWarning("QUmlTemplateableElement::isTemplate(): to be implemented (operation)"); return bool (); } @@ -168,7 +167,7 @@ bool QUmlTemplateableElement::isTemplate() const */ QSet<QUmlParameterableElement *> QUmlTemplateableElement::parameterableElements() const { - qWarning("UmlTemplateableElement::parameterableElements(): to be implemented (operation)"); + qWarning("QUmlTemplateableElement::parameterableElements(): to be implemented (operation)"); return QSet<QUmlParameterableElement *> (); } diff --git a/src/uml/qumltemplateableelement.h b/src/uml/qumltemplateableelement.h index e8e74e51..bb7af122 100644 --- a/src/uml/qumltemplateableelement.h +++ b/src/uml/qumltemplateableelement.h @@ -58,7 +58,6 @@ class QUmlTemplateSignature; class Q_UML_EXPORT QUmlTemplateableElement : public virtual QUmlElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumltemplateparameter.cpp b/src/uml/qumltemplateparameter.cpp index 2e0f58da..3a9212ca 100644 --- a/src/uml/qumltemplateparameter.cpp +++ b/src/uml/qumltemplateparameter.cpp @@ -43,7 +43,6 @@ #include "private/qumltemplateparameterobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateSignature> diff --git a/src/uml/qumltemplateparametersubstitution.cpp b/src/uml/qumltemplateparametersubstitution.cpp index 460e5e18..25d2717b 100644 --- a/src/uml/qumltemplateparametersubstitution.cpp +++ b/src/uml/qumltemplateparametersubstitution.cpp @@ -43,7 +43,6 @@ #include "private/qumltemplateparametersubstitutionobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlParameterableElement> #include <QtUml/QUmlTemplateBinding> #include <QtUml/QUmlTemplateParameter> diff --git a/src/uml/qumltemplatesignature.cpp b/src/uml/qumltemplatesignature.cpp index b122de88..4cdaa227 100644 --- a/src/uml/qumltemplatesignature.cpp +++ b/src/uml/qumltemplatesignature.cpp @@ -43,7 +43,6 @@ #include "private/qumltemplatesignatureobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlElement> #include <QtUml/QUmlTemplateableElement> #include <QtUml/QUmlTemplateParameter> diff --git a/src/uml/qumltimeexpression.cpp b/src/uml/qumltimeexpression.cpp index 8ecf2b91..f0ba490d 100644 --- a/src/uml/qumltimeexpression.cpp +++ b/src/uml/qumltimeexpression.cpp @@ -53,7 +53,6 @@ #include <QtUml/QUmlStringExpression> #include <QtUml/QUmlTemplateParameter> #include <QtUml/QUmlType> -#include <QtUml/QUmlValueSpecification> /*! \class QUmlTimeExpression diff --git a/src/uml/qumltransition.cpp b/src/uml/qumltransition.cpp index c60ef46c..c8fcc1e3 100644 --- a/src/uml/qumltransition.cpp +++ b/src/uml/qumltransition.cpp @@ -50,11 +50,9 @@ #include <QtUml/QUmlElement> #include <QtUml/QUmlElementImport> #include <QtUml/QUmlNamedElement> -#include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPackageableElement> #include <QtUml/QUmlPackageImport> -#include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlRegion> #include <QtUml/QUmlStateMachine> #include <QtUml/QUmlStringExpression> @@ -261,7 +259,7 @@ QUmlClassifier *QUmlTransition::redefinitionContext() const { // This is a read-only derived association end - qWarning("UmlTransition::redefinitionContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlTransition::redefinitionContext(): to be implemented (this is a derived association end)"); return 0; } @@ -270,7 +268,7 @@ void QUmlTransition::setRedefinitionContext(QUmlClassifier *redefinitionContext) { // This is a read-only derived association end - qWarning("UmlTransition::setRedefinitionContext(): to be implemented (this is a derived association end)"); + qWarning("QUmlTransition::setRedefinitionContext(): to be implemented (this is a derived association end)"); Q_UNUSED(redefinitionContext); if (false /* <derivedexclusion-criteria> */) { @@ -366,7 +364,7 @@ void QUmlTransition::removeTrigger(QUmlTrigger *trigger) */ QUmlStateMachine *QUmlTransition::containingStateMachine() const { - qWarning("UmlTransition::containingStateMachine(): to be implemented (operation)"); + qWarning("QUmlTransition::containingStateMachine(): to be implemented (operation)"); return 0; } @@ -376,7 +374,7 @@ QUmlStateMachine *QUmlTransition::containingStateMachine() const */ bool QUmlTransition::isConsistentWith(QUmlRedefinableElement *redefinee) const { - qWarning("UmlTransition::isConsistentWith(): to be implemented (operation)"); + qWarning("QUmlTransition::isConsistentWith(): to be implemented (operation)"); Q_UNUSED(redefinee); return bool (); diff --git a/src/uml/qumltransition.h b/src/uml/qumltransition.h index ce19261a..fda2b4da 100644 --- a/src/uml/qumltransition.h +++ b/src/uml/qumltransition.h @@ -46,8 +46,8 @@ #include <QtUml/QUmlRedefinableElement> #include <QtUml/QUmlNamespace> - #include <QtUml/QtUmlNamespace> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/uml/qumltrigger.cpp b/src/uml/qumltrigger.cpp index d59335b7..55d6b79a 100644 --- a/src/uml/qumltrigger.cpp +++ b/src/uml/qumltrigger.cpp @@ -46,7 +46,6 @@ #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> #include <QtUml/QUmlEvent> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlPort> diff --git a/src/uml/qumltype.cpp b/src/uml/qumltype.cpp index a3c5c467..f4cbb6d2 100644 --- a/src/uml/qumltype.cpp +++ b/src/uml/qumltype.cpp @@ -112,7 +112,7 @@ void QUmlType::setPackage(QUmlPackage *package) */ bool QUmlType::conformsTo(QUmlType *other) const { - qWarning("UmlType::conformsTo(): to be implemented (operation)"); + qWarning("QUmlType::conformsTo(): to be implemented (operation)"); Q_UNUSED(other); return bool (); diff --git a/src/uml/qumltype.h b/src/uml/qumltype.h index c312a33a..e9b2508e 100644 --- a/src/uml/qumltype.h +++ b/src/uml/qumltype.h @@ -56,7 +56,6 @@ class QUmlPackage; class Q_UML_EXPORT QUmlType : public QUmlPackageableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumltypedelement.cpp b/src/uml/qumltypedelement.cpp index ff626768..8b70220b 100644 --- a/src/uml/qumltypedelement.cpp +++ b/src/uml/qumltypedelement.cpp @@ -43,7 +43,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlStringExpression> diff --git a/src/uml/qumltypedelement.h b/src/uml/qumltypedelement.h index cbfe16e8..34b055b4 100644 --- a/src/uml/qumltypedelement.h +++ b/src/uml/qumltypedelement.h @@ -56,7 +56,6 @@ class QUmlType; class Q_UML_EXPORT QUmlTypedElement : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlusage.cpp b/src/uml/qumlusage.cpp index 7f70d3cf..0e597759 100644 --- a/src/uml/qumlusage.cpp +++ b/src/uml/qumlusage.cpp @@ -43,7 +43,6 @@ #include "private/qumlusageobject_p.h" #include <QtUml/QUmlComment> -#include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> diff --git a/src/uml/qumlusecase.cpp b/src/uml/qumlusecase.cpp index 03b8000e..28c55561 100644 --- a/src/uml/qumlusecase.cpp +++ b/src/uml/qumlusecase.cpp @@ -346,7 +346,7 @@ void QUmlUseCase::removeSubject(QUmlClassifier *subject) */ QSet<QUmlUseCase *> QUmlUseCase::allIncludedUseCases() const { - qWarning("UmlUseCase::allIncludedUseCases(): to be implemented (operation)"); + qWarning("QUmlUseCase::allIncludedUseCases(): to be implemented (operation)"); return QSet<QUmlUseCase *> (); } diff --git a/src/uml/qumlvaluespecification.cpp b/src/uml/qumlvaluespecification.cpp index 00c513f0..b8df7361 100644 --- a/src/uml/qumlvaluespecification.cpp +++ b/src/uml/qumlvaluespecification.cpp @@ -89,7 +89,7 @@ QModelingElement *QUmlValueSpecification::clone() const */ bool QUmlValueSpecification::booleanValue() const { - qWarning("UmlValueSpecification::booleanValue(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::booleanValue(): to be implemented (operation)"); return bool (); } @@ -99,7 +99,7 @@ bool QUmlValueSpecification::booleanValue() const */ int QUmlValueSpecification::integerValue() const { - qWarning("UmlValueSpecification::integerValue(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::integerValue(): to be implemented (operation)"); return int (); } @@ -109,7 +109,7 @@ int QUmlValueSpecification::integerValue() const */ bool QUmlValueSpecification::isCompatibleWith(QUmlParameterableElement *p) const { - qWarning("UmlValueSpecification::isCompatibleWith(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::isCompatibleWith(): to be implemented (operation)"); Q_UNUSED(p); return bool (); @@ -120,7 +120,7 @@ bool QUmlValueSpecification::isCompatibleWith(QUmlParameterableElement *p) const */ bool QUmlValueSpecification::isComputable() const { - qWarning("UmlValueSpecification::isComputable(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::isComputable(): to be implemented (operation)"); return bool (); } @@ -130,7 +130,7 @@ bool QUmlValueSpecification::isComputable() const */ bool QUmlValueSpecification::isNull() const { - qWarning("UmlValueSpecification::isNull(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::isNull(): to be implemented (operation)"); return bool (); } @@ -140,7 +140,7 @@ bool QUmlValueSpecification::isNull() const */ double QUmlValueSpecification::realValue() const { - qWarning("UmlValueSpecification::realValue(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::realValue(): to be implemented (operation)"); return double (); } @@ -150,7 +150,7 @@ double QUmlValueSpecification::realValue() const */ QString QUmlValueSpecification::stringValue() const { - qWarning("UmlValueSpecification::stringValue(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::stringValue(): to be implemented (operation)"); return QString (); } @@ -160,7 +160,7 @@ QString QUmlValueSpecification::stringValue() const */ int QUmlValueSpecification::unlimitedValue() const { - qWarning("UmlValueSpecification::unlimitedValue(): to be implemented (operation)"); + qWarning("QUmlValueSpecification::unlimitedValue(): to be implemented (operation)"); return int (); } diff --git a/src/uml/qumlvaluespecification.h b/src/uml/qumlvaluespecification.h index 9e787d1a..f4dc445b 100644 --- a/src/uml/qumlvaluespecification.h +++ b/src/uml/qumlvaluespecification.h @@ -57,7 +57,6 @@ class QUmlParameterableElement; class Q_UML_EXPORT QUmlValueSpecification : public QUmlTypedElement, public QUmlPackageableElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlvariable.cpp b/src/uml/qumlvariable.cpp index 76323c72..cf3158aa 100644 --- a/src/uml/qumlvariable.cpp +++ b/src/uml/qumlvariable.cpp @@ -49,7 +49,6 @@ #include <QtUml/QUmlConnectorEnd> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlMultiplicityElement> #include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> @@ -166,7 +165,7 @@ void QUmlVariable::setScope(QUmlStructuredActivityNode *scope) */ bool QUmlVariable::isAccessibleBy(QUmlAction *a) const { - qWarning("UmlVariable::isAccessibleBy(): to be implemented (operation)"); + qWarning("QUmlVariable::isAccessibleBy(): to be implemented (operation)"); Q_UNUSED(a); return bool (); diff --git a/src/uml/qumlvariableaction.h b/src/uml/qumlvariableaction.h index 9d0d2ae7..8ad36e68 100644 --- a/src/uml/qumlvariableaction.h +++ b/src/uml/qumlvariableaction.h @@ -56,7 +56,6 @@ class QUmlVariable; class Q_UML_EXPORT QUmlVariableAction : public QUmlAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlvertex.cpp b/src/uml/qumlvertex.cpp index 012a91a4..ecb3e98a 100644 --- a/src/uml/qumlvertex.cpp +++ b/src/uml/qumlvertex.cpp @@ -43,7 +43,6 @@ #include <QtUml/QUmlComment> #include <QtUml/QUmlDependency> #include <QtUml/QUmlElement> -#include <QtUml/QUmlNamedElement> #include <QtUml/QUmlNamespace> #include <QtUml/QUmlPackage> #include <QtUml/QUmlRegion> @@ -114,7 +113,7 @@ const QSet<QUmlTransition *> QUmlVertex::incomings() const { // This is a read-only derived association end - qWarning("UmlVertex::incomings(): to be implemented (this is a derived association end)"); + qWarning("QUmlVertex::incomings(): to be implemented (this is a derived association end)"); return QSet<QUmlTransition *>(); } @@ -123,7 +122,7 @@ void QUmlVertex::addIncoming(QUmlTransition *incoming) { // This is a read-only derived association end - qWarning("UmlVertex::addIncoming(): to be implemented (this is a derived association end)"); + qWarning("QUmlVertex::addIncoming(): to be implemented (this is a derived association end)"); Q_UNUSED(incoming); if (false /* <derivedexclusion-criteria> */) { @@ -140,7 +139,7 @@ void QUmlVertex::removeIncoming(QUmlTransition *incoming) { // This is a read-only derived association end - qWarning("UmlVertex::removeIncoming(): to be implemented (this is a derived association end)"); + qWarning("QUmlVertex::removeIncoming(): to be implemented (this is a derived association end)"); Q_UNUSED(incoming); if (false /* <derivedexclusion-criteria> */) { @@ -160,7 +159,7 @@ const QSet<QUmlTransition *> QUmlVertex::outgoings() const { // This is a read-only derived association end - qWarning("UmlVertex::outgoings(): to be implemented (this is a derived association end)"); + qWarning("QUmlVertex::outgoings(): to be implemented (this is a derived association end)"); return QSet<QUmlTransition *>(); } @@ -169,7 +168,7 @@ void QUmlVertex::addOutgoing(QUmlTransition *outgoing) { // This is a read-only derived association end - qWarning("UmlVertex::addOutgoing(): to be implemented (this is a derived association end)"); + qWarning("QUmlVertex::addOutgoing(): to be implemented (this is a derived association end)"); Q_UNUSED(outgoing); if (false /* <derivedexclusion-criteria> */) { @@ -186,7 +185,7 @@ void QUmlVertex::removeOutgoing(QUmlTransition *outgoing) { // This is a read-only derived association end - qWarning("UmlVertex::removeOutgoing(): to be implemented (this is a derived association end)"); + qWarning("QUmlVertex::removeOutgoing(): to be implemented (this is a derived association end)"); Q_UNUSED(outgoing); if (false /* <derivedexclusion-criteria> */) { @@ -206,7 +205,7 @@ void QUmlVertex::removeOutgoing(QUmlTransition *outgoing) */ QUmlStateMachine *QUmlVertex::containingStateMachine() const { - qWarning("UmlVertex::containingStateMachine(): to be implemented (operation)"); + qWarning("QUmlVertex::containingStateMachine(): to be implemented (operation)"); return 0; } diff --git a/src/uml/qumlvertex.h b/src/uml/qumlvertex.h index d73d3d04..e8b831f5 100644 --- a/src/uml/qumlvertex.h +++ b/src/uml/qumlvertex.h @@ -58,7 +58,6 @@ class QUmlTransition; class Q_UML_EXPORT QUmlVertex : public virtual QUmlNamedElement { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlwritelinkaction.h b/src/uml/qumlwritelinkaction.h index 363623b0..8f996fcb 100644 --- a/src/uml/qumlwritelinkaction.h +++ b/src/uml/qumlwritelinkaction.h @@ -54,7 +54,6 @@ QT_MODULE(QtUml) class Q_UML_EXPORT QUmlWriteLinkAction : public QUmlLinkAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; diff --git a/src/uml/qumlwritestructuralfeatureaction.h b/src/uml/qumlwritestructuralfeatureaction.h index 6fa1b87e..7823177d 100644 --- a/src/uml/qumlwritestructuralfeatureaction.h +++ b/src/uml/qumlwritestructuralfeatureaction.h @@ -57,7 +57,6 @@ class QUmlOutputPin; class Q_UML_EXPORT QUmlWriteStructuralFeatureAction : public QUmlStructuralFeatureAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/qumlwritevariableaction.h b/src/uml/qumlwritevariableaction.h index efb4f8e6..9ddf9683 100644 --- a/src/uml/qumlwritevariableaction.h +++ b/src/uml/qumlwritevariableaction.h @@ -56,7 +56,6 @@ class QUmlInputPin; class Q_UML_EXPORT QUmlWriteVariableAction : public QUmlVariableAction { public: - Q_DECL_HIDDEN virtual QModelingElement *clone() const; // Owned attributes diff --git a/src/uml/uml.pro b/src/uml/uml.pro index d81ae298..d5611a29 100644 --- a/src/uml/uml.pro +++ b/src/uml/uml.pro @@ -9,4 +9,4 @@ load(qt_module) include(uml.pri) -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS +HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
\ No newline at end of file |