diff options
| author | Sandro S. Andrade <sandroandrade@kde.org> | 2013-03-05 11:14:29 -0300 |
|---|---|---|
| committer | Sandro S. Andrade <sandroandrade@kde.org> | 2013-03-05 15:17:18 +0100 |
| commit | e2812e4ae6098b6aacbe2428106ea056e0a35eed (patch) | |
| tree | 47c407584b44b89db8e774010a969bcda3967298 | |
| parent | fb81585888ac1a493b581db7d543740cc120429a (diff) | |
Provide major refactoring for correct declaration of properties
The use of macro QT_BEGIN_NAMESPACE_QTMOF/UML has been removed
since MOC need a explicit namespace declaration in order to
auto-declare metatypes with namespace information. Similarly,
all properties are now declared using fully qualified class
names.
In addition, QtMof and QtUml namespaces were renamed to QtMofNS
and QtUmlNS in order to prevent ambiguity.
Change-Id: I8a1692a039101b56c1b1b0c76c59b1f963eb9d53
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>
911 files changed, 14204 insertions, 9758 deletions
diff --git a/examples/uml/qtumleditor/mainwindow.cpp b/examples/uml/qtumleditor/mainwindow.cpp index d6091f1d..df0ddd7b 100644 --- a/examples/uml/qtumleditor/mainwindow.cpp +++ b/examples/uml/qtumleditor/mainwindow.cpp @@ -98,10 +98,12 @@ QWrappedObject *MainWindow::loadXmi() setWindowTitle(QFileInfo(file).fileName() + " - QtUml Editor"); QWrappedObject *wrappedObject = reader.readFile(&file); ui->txeIssues->setModel(new QStringListModel(reader.errorStrings())); - _engine.globalObject().setProperty("model", _engine.newQObject(wrappedObject)); - _engine.globalObject().setProperty(wrappedObject->objectName(), _engine.newQObject(wrappedObject)); - ui->txeJavaScript->setText(wrappedObject->objectName()); - QTimer::singleShot(0, this, SLOT(on_psbJSEvaluate_clicked())); + if (wrappedObject) { + _engine.globalObject().setProperty("model", _engine.newQObject(wrappedObject)); + _engine.globalObject().setProperty(wrappedObject->objectName(), _engine.newQObject(wrappedObject)); + ui->txeJavaScript->setText(wrappedObject->objectName()); + QTimer::singleShot(0, this, SLOT(on_psbJSEvaluate_clicked())); + } return wrappedObject; } @@ -209,6 +211,7 @@ void MainWindow::loadPlugins() QObject *plugin = loader.instance(); if (plugin && (metaModelPlugin = qobject_cast<QMetaModelPlugin *>(plugin))) { _loadedPlugins.insert(metaModelPlugin->metaModelNamespaceUri(), QPair<QMetaModelPlugin *, QJsonObject>(metaModelPlugin, loader.metaData())); + metaModelPlugin->initMetaModel(); } } } diff --git a/examples/uml/xmi-read/main.cpp b/examples/uml/xmi-read/main.cpp index fcc5832b..621bc2e4 100644 --- a/examples/uml/xmi-read/main.cpp +++ b/examples/uml/xmi-read/main.cpp @@ -11,7 +11,7 @@ int main () return 1; } - QXmiReader reader; + QXmiReader reader(0, true); QWrappedObject *rootElement = reader.readFile(&file); if (rootElement) qDebug() << "Successfully read object with name" << rootElement->objectName(); diff --git a/scripts/normative-xmi/MOF-merged.qtxmi.gz b/scripts/normative-xmi/MOF-merged.qtxmi.gz Binary files differindex 9d3b312b..7e6699b6 100644 --- a/scripts/normative-xmi/MOF-merged.qtxmi.gz +++ b/scripts/normative-xmi/MOF-merged.qtxmi.gz diff --git a/scripts/normative-xmi/MOF-merged.xmi.gz b/scripts/normative-xmi/MOF-merged.xmi.gz Binary files differindex d21fb5a0..6aa648dc 100644 --- a/scripts/normative-xmi/MOF-merged.xmi.gz +++ b/scripts/normative-xmi/MOF-merged.xmi.gz diff --git a/scripts/normative-xmi/UML.qtxmi.gz b/scripts/normative-xmi/UML.qtxmi.gz Binary files differindex 442a2800..3b96556f 100644 --- a/scripts/normative-xmi/UML.qtxmi.gz +++ b/scripts/normative-xmi/UML.qtxmi.gz diff --git a/scripts/normative-xmi/UML.xmi.gz b/scripts/normative-xmi/UML.xmi.gz Binary files differindex ef185ee9..db81ba58 100644 --- a/scripts/normative-xmi/UML.xmi.gz +++ b/scripts/normative-xmi/UML.xmi.gz diff --git a/scripts/normative-xmi/xmi2qt.xq b/scripts/normative-xmi/xmi2qt.xq index 009e48e0..cde8403f 100644 --- a/scripts/normative-xmi/xmi2qt.xq +++ b/scripts/normative-xmi/xmi2qt.xq @@ -13,10 +13,10 @@ declare function qtxmi:typeStringFromProperty ($properties as node()*) as xs:str declare function qtxmi:mappedBaseNamespace($xmiFile as xs:string*) as xs:string* { if ($xmiFile = "PrimitiveTypes.xmi") then "" - else if ($xmiFile = "Superstructure.xmi") then "QtUml::" - else if ($xmiFile = "UML.xmi") then "QtUml::" - else if ($xmiFile = "MOF.xmi") then "QtMof::" - else if ($xmiFile = "MOF-merged.xmi") then "QtMof::" + else if ($xmiFile = "Superstructure.xmi") then "QtUml" + else if ($xmiFile = "UML.xmi") then "QtUml" + else if ($xmiFile = "MOF.xmi") then "QtMof" + else if ($xmiFile = "MOF-merged.xmi") then "QtMof" else "QtUnknown" }; @@ -126,7 +126,7 @@ declare function qtxmi:typeFromNamespacedTypeString ($string as xs:string, $name let $type := if ($element/@xmi:type = "uml:Class") then concat($propertyNamespace, concat("Q", $type)) else if ($element/@xmi:type = "uml:Enumeration") then - concat($propertyNamespace, concat(concat(tokenize($namespace, "::")[1], "::"), $type)) + concat($propertyNamespace, concat(concat(tokenize($namespace, "::")[1], "NS::"), $type)) else qtxmi:mappedPrimitiveType($type) return $type @@ -193,7 +193,7 @@ declare function qtxmi:defaultValue ($property as node(), $namespace) as xs:stri else if ($property/defaultValue/@xmi:type = "uml:InstanceValue" and qtxmi:elementFromTypeString($property/defaultValue/@type)/@xmi:type = "uml:Enumeration") then if ($property/defaultValue/@instance) then - concat($namespace, + concat(replace($namespace, "::", "NS::"), concat(replace(replace(tokenize($property/defaultValue/@instance, "-")[1], "Kind", ""), "Sort", ""), concat(upper-case(substring(tokenize($property/defaultValue/@instance, "-")[2], 1, 1)), substring(tokenize($property/defaultValue/@instance, "-")[2], 2)))) diff --git a/scripts/templates/class.cpp b/scripts/templates/class.cpp index 085c90e5..d28719d8 100644 --- a/scripts/templates/class.cpp +++ b/scripts/templates/class.cpp @@ -534,7 +534,10 @@ void ${class.name}::unset${associationend.accessor.0.name.ucfirst.replace('^Is', [% END -%] #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_${namespace.replace('/', '_').upper} +QT_BEGIN_NAMESPACE + +namespace ${namespace.replace('/', '_')} +{ ${class.name}Private::${class.name}Private() [%- found = 'false' -%] @@ -834,10 +837,10 @@ ${operation.return}${class.name}::${operation.name}([%- FOREACH parameter IN ope void ${class.name}::setPropertyData() { [%- FOREACH attribute IN class.attribute.values %] - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("${attribute.aggregation}"); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::IsDerivedUnionRole] = [%- IF attribute.isDerivedUnion == 'true' %]true[% ELSE %]false[% END %]; - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("${attribute.documentation.replace('"', '\"')}"); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(" + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("${attribute.aggregation}"); + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::IsDerivedUnionRole] = [%- IF attribute.isDerivedUnion == 'true' %]true[% ELSE %]false[% END %]; + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("${attribute.documentation.replace('"', '\"')}"); + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(" [%- FOREACH redefinedProperty IN attribute.redefinedProperty.split(' ') -%] [%- redefinedClass = redefinedProperty.split('-').0.replace('^', 'Q') -%] [%- IF classes.item(redefinedClass).attribute.item(redefinedProperty) -%] @@ -848,7 +851,7 @@ void ${class.name}::setPropertyData() [%- IF !loop.first %] [% END %]${redefinedClass}::${redefinedPropertyItem.accessor.0.name.remove('_$')} [%- END -%] "); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(" + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(" [%- FOREACH subsettedProperty IN attribute.subsettedProperty.split(' ') -%] [%- subsettedClass = subsettedProperty.split('-').0.replace('^', 'Q') -%] [%- IF classes.item(subsettedClass).attribute.item(subsettedProperty) -%] @@ -859,14 +862,14 @@ void ${class.name}::setPropertyData() [%- IF !loop.first %] [% END %]${subsettedClass}::${subsettedPropertyItem.accessor.0.name.remove('_$')} [%- END -%] "); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("${attribute.oppositeEnd.replace('^(.)', 'Q$1').replace(' ', ' Q').replace('-','::')}"); + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${attribute.accessor.0.name}")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("${attribute.oppositeEnd.replace('^(.)', 'Q$1').replace(' ', ' Q').replace('-','::')}"); [%- END -%] [%- FOREACH associationend IN class.associationend.values %] - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("${associationend.aggregation}"); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::IsDerivedUnionRole] = [%- IF associationend.isDerivedUnion == 'true' %]true[% ELSE %]false[% END %]; - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("${associationend.documentation.replace('"', '\"')}"); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(" + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("${associationend.aggregation}"); + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::IsDerivedUnionRole] = [%- IF associationend.isDerivedUnion == 'true' %]true[% ELSE %]false[% END %]; + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("${associationend.documentation.replace('"', '\"')}"); + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(" [%- FOREACH redefinedProperty IN associationend.redefinedProperty.split(' ') -%] [%- redefinedClass = redefinedProperty.split('-').0.replace('^', 'Q') -%] [%- IF classes.item(redefinedClass).attribute.item(redefinedProperty) -%] @@ -877,7 +880,7 @@ void ${class.name}::setPropertyData() [%- IF !loop.first %] [% END %]${redefinedClass}::${redefinedPropertyItem.accessor.0.name.remove('_$')} [%- END -%] "); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(" + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(" [%- FOREACH subsettedProperty IN associationend.subsettedProperty.split(' ') -%] [%- subsettedClass = subsettedProperty.split('-').0.replace('^', 'Q') -%] [%- IF classes.item(subsettedClass).attribute.item(subsettedProperty) -%] @@ -888,7 +891,7 @@ void ${class.name}::setPropertyData() [%- IF !loop.first %] [% END %]${subsettedClass}::${subsettedPropertyItem.accessor.0.name.remove('_$')} [%- END -%] "); - QWrappedObject::propertyDataHash[QString::fromLatin1("${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("${associationend.oppositeEnd.replace('^(.)', 'Q$1').replace(' ', ' Q').replace('-','::')}"); + QWrappedObject::propertyDataHash[QString::fromLatin1("${namespace.replace('/', '_')}::${class.name}")][QString::fromLatin1("${associationend.accessor.0.name}")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("${associationend.oppositeEnd.replace('^(.)', 'Q$1').replace(' ', ' Q').replace('-','::')}"); [%- END %] [% IF class.superclass.size == 1 %]${class.superclass.0.name.split('/').last}[% ELSE %]QWrappedObject[% END %]::setPropertyData(); @@ -973,7 +976,9 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN assoc [%- END -%] [%- END -%] [%- END %] -#include "moc_${class.name.lower}.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_${namespace.replace('/', '_').upper} +#include "moc_${class.name.lower}.cpp" diff --git a/scripts/templates/class.h b/scripts/templates/class.h index 160ca85b..b8ebdbc2 100644 --- a/scripts/templates/class.h +++ b/scripts/templates/class.h @@ -54,9 +54,9 @@ [%- found = 'true' -%] [%- END -%] [%- IF attribute.isReadOnly == 'true' or attribute.accessor.size == 3 %] - Q_PROPERTY(${attribute.accessor.0.return.remove('^const ').remove('&$')}[%- IF attribute.accessor.0.return.substr(attribute.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${attribute.accessor.0.name} READ ${attribute.accessor.0.name}[% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) + Q_PROPERTY(${attribute.accessor.0.return.remove('^const ').remove('&$').replace('(Q[^<]+ \*)', "$namespace::\$1")}[%- IF attribute.accessor.0.return.substr(attribute.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${attribute.accessor.0.name} READ ${attribute.accessor.0.name}[% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) [%- ELSE %] - Q_PROPERTY(${attribute.accessor.0.return}[%- IF attribute.accessor.0.return.substr(attribute.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${attribute.accessor.0.name} READ ${attribute.accessor.0.name} WRITE ${attribute.accessor.1.name}[% IF attribute.defaultValue != '' %] RESET unset${attribute.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) + Q_PROPERTY(${attribute.accessor.0.return.replace('(Q[^<]+ \*)', "$namespace::\$1")}[%- IF attribute.accessor.0.return.substr(attribute.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${attribute.accessor.0.name} READ ${attribute.accessor.0.name} WRITE ${attribute.accessor.1.name}[% IF attribute.defaultValue != '' %] RESET unset${attribute.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF attribute.isDerived == 'true' and attribute.isDerivedUnion == 'false' %] STORED false[% END %]) [%- END -%] [%- END -%] [%- END -%] @@ -70,9 +70,9 @@ [%- found = 'true' -%] [%- END -%] [%- IF associationend.isReadOnly == 'true' or associationend.accessor.size == 3 %] - Q_PROPERTY(${associationend.accessor.0.return.remove('^const ').remove('&$')}[%- IF associationend.accessor.0.return.substr(associationend.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${associationend.accessor.0.name} READ ${associationend.accessor.0.name}[% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) + Q_PROPERTY(${associationend.accessor.0.return.remove('^const ').remove('&$').replace('(Q[^<]+ \*)', "$namespace::\$1")}[%- IF associationend.accessor.0.return.substr(associationend.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${associationend.accessor.0.name} READ ${associationend.accessor.0.name}[% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) [%- ELSE %] - Q_PROPERTY(${associationend.accessor.0.return}[%- IF associationend.accessor.0.return.substr(associationend.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${associationend.accessor.0.name} READ ${associationend.accessor.0.name} WRITE ${associationend.accessor.1.name}[% IF associationend.defaultValue != '' %] RESET unset${associationend.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) + Q_PROPERTY(${associationend.accessor.0.return.replace('(Q[^<]+ \*)', "$namespace::\$1")}[%- IF associationend.accessor.0.return.substr(associationend.accessor.0.return.length - 1, 1) == '*' -%] [% END -%]${associationend.accessor.0.name} READ ${associationend.accessor.0.name} WRITE ${associationend.accessor.1.name}[% IF associationend.defaultValue != '' %] RESET unset${associationend.accessor.0.name.ucfirst.replace('^Is', '')}[% END %][% IF associationend.isDerived == 'true' and associationend.isDerivedUnion == 'false' %] STORED false[% END %]) [%- END -%] [%- END -%] [%- END %] @@ -261,7 +261,10 @@ QT_END_NAMESPACE_${currentNamespace.replace('::', '_').upper} [%- END %] -QT_BEGIN_NAMESPACE_${namespace.replace('/', '_').upper} +QT_BEGIN_NAMESPACE + +namespace ${namespace.replace('/', '_')} +{ QT_MODULE([% namespace.split('/').0 %]) @@ -387,7 +390,9 @@ private: [%- END %] }; -QT_END_NAMESPACE_${namespace.replace('/', '_').upper} +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/scripts/templates/class_p.h b/scripts/templates/class_p.h index c7d5068b..d0a5d80f 100644 --- a/scripts/templates/class_p.h +++ b/scripts/templates/class_p.h @@ -90,7 +90,10 @@ QT_END_NAMESPACE_${currentNamespace.replace('::', '_').upper} [%- END %] -QT_BEGIN_NAMESPACE_${namespace.replace('/', '_').upper} +QT_BEGIN_NAMESPACE + +namespace ${namespace.replace('/', '_')} +{ QT_MODULE([% namespace.split('/').0 %]) @@ -168,7 +171,9 @@ public: [%- END %] }; -QT_END_NAMESPACE_${namespace.replace('/', '_').upper} +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/scripts/templates/namespace.cpp b/scripts/templates/namespace.cpp index 51e3e27f..89c0024d 100644 --- a/scripts/templates/namespace.cpp +++ b/scripts/templates/namespace.cpp @@ -41,15 +41,11 @@ #include "${namespace.split('/').0.lower}namespace.h" -QT_BEGIN_NAMESPACE_${namespace.replace('/', '_').upper} - -${namespace.split('/').0}::${namespace.split('/').0}() -{ -} +QT_BEGIN_NAMESPACE [% FOREACH enumeration IN enumerations -%] /*! - \enum ${namespace.replace('/', '::')}::${namespace.replace('/', '::')}::${enumeration.name} + \enum ${namespace.replace('/', '::')}NS::${enumeration.name} ${enumeration.documentation} @@ -60,7 +56,5 @@ ${namespace.split('/').0}::${namespace.split('/').0}() */ [% END -%] -#include "moc_${namespace.split('/').0.lower}namespace.cpp" - -QT_END_NAMESPACE_${namespace.replace('/', '_').upper} +QT_END_NAMESPACE diff --git a/scripts/templates/namespace.h b/scripts/templates/namespace.h index 607a6b95..aa907c0d 100644 --- a/scripts/templates/namespace.h +++ b/scripts/templates/namespace.h @@ -47,11 +47,11 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_${namespace.replace('/', '_').upper} +QT_BEGIN_NAMESPACE QT_MODULE([% namespace.split('/').0 %]) -class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${namespace.split('::').0} : public QObject +class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${namespace.split('::').0}NS : public QObject { Q_OBJECT @@ -68,11 +68,9 @@ public: }; [% END -%] -private: - explicit ${namespace.split('/').0}(); }; -QT_END_NAMESPACE_${namespace.replace('/', '_').upper} +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qargument.cpp b/src/mof/qargument.cpp index f6bbc4ab..cb67674f 100644 --- a/src/mof/qargument.cpp +++ b/src/mof/qargument.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QArgumentPrivate::QArgumentPrivate() : value(0) @@ -116,24 +119,26 @@ void QArgument::setValue(QMofObject *value) void QArgument::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QArgument")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qargument.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qargument.cpp" diff --git a/src/mof/qargument.h b/src/mof/qargument.h index 90a022ce..bbcd9d5d 100644 --- a/src/mof/qargument.h +++ b/src/mof/qargument.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,7 +68,7 @@ class Q_MOF_EXPORT QArgument : public QWrappedObject Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QMofObject * value READ value WRITE setValue) + Q_PROPERTY(QtMof::QMofObject * value READ value WRITE setValue) Q_DISABLE_COPY(QArgument) Q_DECLARE_PRIVATE(QArgument) @@ -86,7 +89,9 @@ protected: explicit QArgument(QArgumentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qargument_p.h b/src/mof/qargument_p.h index 4def7925..0ddd60a3 100644 --- a/src/mof/qargument_p.h +++ b/src/mof/qargument_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -71,7 +74,9 @@ public: QMofObject *value; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qassociation.cpp b/src/mof/qassociation.cpp index 3aeab4aa..67ff2e51 100644 --- a/src/mof/qassociation.cpp +++ b/src/mof/qassociation.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QAssociationPrivate::QAssociationPrivate() : isDerived(false) @@ -180,19 +183,19 @@ QNamespace *QAssociation::namespace_() const /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtMof::VisibilityKind QAssociation::visibility() const +QtMofNS::VisibilityKind QAssociation::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QAssociation::setVisibility(QtMof::VisibilityKind visibility) +void QAssociation::setVisibility(QtMofNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QAssociation::unsetVisibility() { - setVisibility(QtMof::VisibilityPublic); + setVisibility(QtMofNS::VisibilityPublic); Q_D(QAssociation); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -644,45 +647,47 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) void QAssociation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the association is derived from other model elements such as other associations or constraints."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifiers that are used as types of the ends of the association."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The navigable ends that are owned by the association itself."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAssociation::ownedEnds"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ends that are owned by the association itself."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers QAssociation::memberEnds"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::owningAssociation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Each end represents participation of instances of the classifier connected to the end in links of the association."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::association"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the association is derived from other model elements such as other associations or constraints."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifiers that are used as types of the ends of the association."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The navigable ends that are owned by the association itself."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAssociation::ownedEnds"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ends that are owned by the association itself."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers QAssociation::memberEnds"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::owningAssociation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Each end represents participation of instances of the classifier connected to the end in links of the association."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::association"); QWrappedObject::setPropertyData(); } -#include "moc_qassociation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qassociation.cpp" diff --git a/src/mof/qassociation.h b/src/mof/qassociation.h index e1c420c0..ed5c962e 100644 --- a/src/mof/qassociation.h +++ b/src/mof/qassociation.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -68,45 +71,45 @@ class Q_MOF_EXPORT QAssociation : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtMof::QElement *> relatedElements READ relatedElements) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtMof::QPackage * package READ package WRITE setPackage) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtMof::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtMof::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtMof::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtMof::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtMof::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtMof::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtMof::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtMof::QNamedElement *> ownedMembers READ ownedMembers) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(QSet<QProperty *> attributes READ attributes) - Q_PROPERTY(QSet<QFeature *> features READ features) - Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) - Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QtMof::QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QtMof::QFeature *> features READ features) + Q_PROPERTY(QSet<QtMof::QClassifier *> generals READ generals STORED false) + Q_PROPERTY(QSet<QtMof::QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QSet<QtMof::QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QtMof::QGeneralization *> generalizations READ generalizations) Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) - Q_PROPERTY(QList<QType *> endTypes READ endTypes STORED false) - Q_PROPERTY(QSet<QProperty *> navigableOwnedEnds READ navigableOwnedEnds) - Q_PROPERTY(QList<QProperty *> ownedEnds READ ownedEnds) - Q_PROPERTY(QList<QProperty *> memberEnds READ memberEnds) + Q_PROPERTY(QList<QtMof::QType *> endTypes READ endTypes STORED false) + Q_PROPERTY(QSet<QtMof::QProperty *> navigableOwnedEnds READ navigableOwnedEnds) + Q_PROPERTY(QList<QtMof::QProperty *> ownedEnds READ ownedEnds) + Q_PROPERTY(QList<QtMof::QProperty *> memberEnds READ memberEnds) Q_DISABLE_COPY(QAssociation) Q_DECLARE_PRIVATE(QAssociation) @@ -134,8 +137,8 @@ public: Q_INVOKABLE QNamespace *namespace_() const; // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QType @@ -214,7 +217,9 @@ private: QClassifier *_wrappedClassifier; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qassociation_p.h b/src/mof/qassociation_p.h index 52320a89..f9f5e251 100644 --- a/src/mof/qassociation_p.h +++ b/src/mof/qassociation_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -77,7 +80,9 @@ public: QList<QProperty *> memberEnds; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qbehavioralfeature.cpp b/src/mof/qbehavioralfeature.cpp index ba088520..103e5fe3 100644 --- a/src/mof/qbehavioralfeature.cpp +++ b/src/mof/qbehavioralfeature.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QBehavioralFeaturePrivate::QBehavioralFeaturePrivate() { @@ -144,12 +147,12 @@ void QBehavioralFeature::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtMof::VisibilityKind QBehavioralFeature::visibility() const +QtMofNS::VisibilityKind QBehavioralFeature::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QBehavioralFeature::setVisibility(QtMof::VisibilityKind visibility) +void QBehavioralFeature::setVisibility(QtMofNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -422,24 +425,26 @@ bool QBehavioralFeature::isDistinguishableFrom(const QNamedElement *n, const QNa void QBehavioralFeature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this feature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this feature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the ordered set of formal parameters of this BehavioralFeature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the ordered set of formal parameters of this BehavioralFeature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qbehavioralfeature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qbehavioralfeature.cpp" diff --git a/src/mof/qbehavioralfeature.h b/src/mof/qbehavioralfeature.h index 99314626..6ba663dd 100644 --- a/src/mof/qbehavioralfeature.h +++ b/src/mof/qbehavioralfeature.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -69,31 +72,31 @@ class Q_MOF_EXPORT QBehavioralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtMof::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtMof::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtMof::QClassifier *> featuringClassifiers READ featuringClassifiers) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtMof::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtMof::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtMof::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtMof::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtMof::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtMof::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) - Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) + Q_PROPERTY(QSet<QtMof::QType *> raisedExceptions READ raisedExceptions) + Q_PROPERTY(QList<QtMof::QParameter *> ownedParameters READ ownedParameters) Q_DISABLE_COPY(QBehavioralFeature) Q_DECLARE_PRIVATE(QBehavioralFeature) @@ -112,8 +115,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -171,7 +174,9 @@ private: QNamespace *_wrappedNamespace; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qbehavioralfeature_p.h b/src/mof/qbehavioralfeature_p.h index d106f434..da5da5e5 100644 --- a/src/mof/qbehavioralfeature_p.h +++ b/src/mof/qbehavioralfeature_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -75,7 +78,9 @@ public: QList<QParameter *> ownedParameters; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qclass.cpp b/src/mof/qclass.cpp index 4898b23d..e351daf6 100644 --- a/src/mof/qclass.cpp +++ b/src/mof/qclass.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QClassPrivate::QClassPrivate() : isAbstract(false) @@ -305,45 +308,47 @@ QSet<QNamedElement *> QClass::inherit(QSet<QNamedElement *> inhs) const void QClass::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::isAbstract"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Classifiers that are defined (nested) within the Class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operations owned by the class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::class"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes (i.e. the properties) owned by the class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::attributes QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::class"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This gives the superclasses of a class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::generals"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::isAbstract"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Classifiers that are defined (nested) within the Class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operations owned by the class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::class"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes (i.e. the properties) owned by the class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::attributes QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::class"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This gives the superclasses of a class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::generals"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClassifier::setPropertyData(); } -#include "moc_qclass.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qclass.cpp" diff --git a/src/mof/qclass.h b/src/mof/qclass.h index 169a73b2..88d303c0 100644 --- a/src/mof/qclass.h +++ b/src/mof/qclass.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -68,10 +71,10 @@ class Q_MOF_EXPORT QClass : public QClassifier Q_OBJECT Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(QList<QClassifier *> nestedClassifiers READ nestedClassifiers) - Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) - Q_PROPERTY(QSet<QClass *> superClasses READ superClasses STORED false) + Q_PROPERTY(QList<QtMof::QClassifier *> nestedClassifiers READ nestedClassifiers) + Q_PROPERTY(QList<QtMof::QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QtMof::QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QSet<QtMof::QClass *> superClasses READ superClasses STORED false) Q_DISABLE_COPY(QClass) Q_DECLARE_PRIVATE(QClass) @@ -108,7 +111,9 @@ protected: explicit QClass(QClassPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qclass_p.h b/src/mof/qclass_p.h index bf959ead..a2a8a0ae 100644 --- a/src/mof/qclass_p.h +++ b/src/mof/qclass_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -76,7 +79,9 @@ public: QList<QProperty *> ownedAttributes; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qclassifier.cpp b/src/mof/qclassifier.cpp index 27e5a976..638291b4 100644 --- a/src/mof/qclassifier.cpp +++ b/src/mof/qclassifier.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QClassifierPrivate::QClassifierPrivate() : isAbstract(false), @@ -232,19 +235,19 @@ QNamespace *QClassifier::namespace_() const /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtMof::VisibilityKind QClassifier::visibility() const +QtMofNS::VisibilityKind QClassifier::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QClassifier::setVisibility(QtMof::VisibilityKind visibility) +void QClassifier::setVisibility(QtMofNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QClassifier::unsetVisibility() { - setVisibility(QtMof::VisibilityPublic); + setVisibility(QtMofNS::VisibilityPublic); Q_D(QClassifier); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -695,66 +698,68 @@ QSet<QClassifier *> QClassifier::parents() const void QClassifier::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier cannot be specialized by generalization. Note that this property is preserved through package merge operations; that is, the capability to specialize a Classifier (i.e., isFinalSpecialization =false) must be preserved in the resulting Classifier of a package merge operation where a Classifier with isFinalSpecialization =false is merged with a matching Classifier with isFinalSpecialization =true: the resulting Classifier will have isFinalSpecialization =false."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies each feature defined in the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QFeature::featuringClassifier"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the general Classifiers for this Classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Classifiers that are redefined by this Classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies all elements inherited by this classifier from the general classifiers."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralization::specific"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier cannot be specialized by generalization. Note that this property is preserved through package merge operations; that is, the capability to specialize a Classifier (i.e., isFinalSpecialization =false) must be preserved in the resulting Classifier of a package merge operation where a Classifier with isFinalSpecialization =false is merged with a matching Classifier with isFinalSpecialization =true: the resulting Classifier will have isFinalSpecialization =false."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies each feature defined in the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QFeature::featuringClassifier"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the general Classifiers for this Classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Classifiers that are redefined by this Classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies all elements inherited by this classifier from the general classifiers."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralization::specific"); QWrappedObject::setPropertyData(); } -#include "moc_qclassifier.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qclassifier.cpp" diff --git a/src/mof/qclassifier.h b/src/mof/qclassifier.h index 0a942d92..037f8dc9 100644 --- a/src/mof/qclassifier.h +++ b/src/mof/qclassifier.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -70,37 +73,37 @@ class Q_MOF_EXPORT QClassifier : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtMof::QPackage * package READ package WRITE setPackage) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtMof::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtMof::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtMof::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtMof::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtMof::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtMof::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtMof::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtMof::QNamedElement *> ownedMembers READ ownedMembers) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(QSet<QProperty *> attributes READ attributes) - Q_PROPERTY(QSet<QFeature *> features READ features) - Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) - Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QtMof::QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QtMof::QFeature *> features READ features) + Q_PROPERTY(QSet<QtMof::QClassifier *> generals READ generals STORED false) + Q_PROPERTY(QSet<QtMof::QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QSet<QtMof::QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QtMof::QGeneralization *> generalizations READ generalizations) Q_DISABLE_COPY(QClassifier) Q_DECLARE_PRIVATE(QClassifier) @@ -125,8 +128,8 @@ public: Q_INVOKABLE QNamespace *namespace_() const; // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QType @@ -202,7 +205,9 @@ private: QNamespace *_wrappedNamespace; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qclassifier_p.h b/src/mof/qclassifier_p.h index fa76ed70..4d69c52e 100644 --- a/src/mof/qclassifier_p.h +++ b/src/mof/qclassifier_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -87,7 +90,9 @@ public: void removeFeature(QFeature *feature); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qcomment.cpp b/src/mof/qcomment.cpp index d4e67ddc..cb404730 100644 --- a/src/mof/qcomment.cpp +++ b/src/mof/qcomment.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QCommentPrivate::QCommentPrivate() { @@ -140,24 +143,26 @@ void QComment::removeAnnotatedElement(QElement *annotatedElement) void QComment::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a string that is the comment."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Element(s) being commented."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("body")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("body")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("body")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a string that is the comment."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("body")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("body")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("body")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Element(s) being commented."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qcomment.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qcomment.cpp" diff --git a/src/mof/qcomment.h b/src/mof/qcomment.h index c386dfc3..bbd4c99d 100644 --- a/src/mof/qcomment.h +++ b/src/mof/qcomment.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -63,7 +66,7 @@ class Q_MOF_EXPORT QComment : public QElement Q_OBJECT Q_PROPERTY(QString body READ body WRITE setBody) - Q_PROPERTY(QSet<QElement *> annotatedElements READ annotatedElements) + Q_PROPERTY(QSet<QtMof::QElement *> annotatedElements READ annotatedElements) Q_DISABLE_COPY(QComment) Q_DECLARE_PRIVATE(QComment) @@ -87,7 +90,9 @@ protected: explicit QComment(QCommentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qcomment_p.h b/src/mof/qcomment_p.h index 16bcb9a6..c0d15476 100644 --- a/src/mof/qcomment_p.h +++ b/src/mof/qcomment_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QComment; @@ -69,7 +72,9 @@ public: QSet<QElement *> annotatedElements; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qconstraint.cpp b/src/mof/qconstraint.cpp index ddde9ac4..c4942cb1 100644 --- a/src/mof/qconstraint.cpp +++ b/src/mof/qconstraint.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QConstraintPrivate::QConstraintPrivate() : context(0), @@ -182,31 +185,33 @@ void QConstraint::removeConstrainedElement(QElement *constrainedElement) void QConstraint::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedRule"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of Elements referenced by this Constraint."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedRule"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of Elements referenced by this Constraint."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QPackageableElement::setPropertyData(); } -#include "moc_qconstraint.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qconstraint.cpp" diff --git a/src/mof/qconstraint.h b/src/mof/qconstraint.h index 42ffdcf2..412b8191 100644 --- a/src/mof/qconstraint.h +++ b/src/mof/qconstraint.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -66,9 +69,9 @@ class Q_MOF_EXPORT QConstraint : public QPackageableElement { Q_OBJECT - Q_PROPERTY(QNamespace * context READ context WRITE setContext) - Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(QList<QElement *> constrainedElements READ constrainedElements) + Q_PROPERTY(QtMof::QNamespace * context READ context WRITE setContext) + Q_PROPERTY(QtMof::QValueSpecification * specification READ specification WRITE setSpecification) + Q_PROPERTY(QList<QtMof::QElement *> constrainedElements READ constrainedElements) Q_DISABLE_COPY(QConstraint) Q_DECLARE_PRIVATE(QConstraint) @@ -92,7 +95,9 @@ protected: explicit QConstraint(QConstraintPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qconstraint_p.h b/src/mof/qconstraint_p.h index c5595ed9..f692521b 100644 --- a/src/mof/qconstraint_p.h +++ b/src/mof/qconstraint_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -74,7 +77,9 @@ public: QList<QElement *> constrainedElements; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qdatatype.cpp b/src/mof/qdatatype.cpp index d7bc0f54..94fcea4e 100644 --- a/src/mof/qdatatype.cpp +++ b/src/mof/qdatatype.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QDataTypePrivate::QDataTypePrivate() { @@ -189,24 +192,26 @@ QSet<QNamedElement *> QDataType::inherit(QSet<QNamedElement *> inhs) const void QDataType::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Operations owned by the DataType."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::datatype"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Attributes owned by the DataType."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::attributes QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::datatype"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Operations owned by the DataType."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::datatype"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Attributes owned by the DataType."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::attributes QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::datatype"); QClassifier::setPropertyData(); } -#include "moc_qdatatype.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qdatatype.cpp" diff --git a/src/mof/qdatatype.h b/src/mof/qdatatype.h index 10f85903..856f6d3a 100644 --- a/src/mof/qdatatype.h +++ b/src/mof/qdatatype.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -67,8 +70,8 @@ class Q_MOF_EXPORT QDataType : public QClassifier { Q_OBJECT - Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QList<QtMof::QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QtMof::QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QDataType) Q_DECLARE_PRIVATE(QDataType) @@ -94,7 +97,9 @@ protected: explicit QDataType(QDataTypePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qdatatype_p.h b/src/mof/qdatatype_p.h index 89281cfa..b4b62b3c 100644 --- a/src/mof/qdatatype_p.h +++ b/src/mof/qdatatype_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -74,7 +77,9 @@ public: QList<QProperty *> ownedAttributes; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qdirectedrelationship.cpp b/src/mof/qdirectedrelationship.cpp index 3bcaef9e..f362d031 100644 --- a/src/mof/qdirectedrelationship.cpp +++ b/src/mof/qdirectedrelationship.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() { @@ -156,24 +159,26 @@ QSet<QElement *> QDirectedRelationship::targets() const void QDirectedRelationship::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the sources of the DirectedRelationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the targets of the DirectedRelationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the sources of the DirectedRelationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the targets of the DirectedRelationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QRelationship::setPropertyData(); } -#include "moc_qdirectedrelationship.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qdirectedrelationship.cpp" diff --git a/src/mof/qdirectedrelationship.h b/src/mof/qdirectedrelationship.h index 241600e8..87db75df 100644 --- a/src/mof/qdirectedrelationship.h +++ b/src/mof/qdirectedrelationship.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -64,8 +67,8 @@ class Q_MOF_EXPORT QDirectedRelationship : public QRelationship { Q_OBJECT - Q_PROPERTY(QSet<QElement *> sources READ sources) - Q_PROPERTY(QSet<QElement *> targets READ targets) + Q_PROPERTY(QSet<QtMof::QElement *> sources READ sources) + Q_PROPERTY(QSet<QtMof::QElement *> targets READ targets) Q_DISABLE_COPY(QDirectedRelationship) Q_DECLARE_PRIVATE(QDirectedRelationship) @@ -84,7 +87,9 @@ protected: explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qdirectedrelationship_p.h b/src/mof/qdirectedrelationship_p.h index b0a2ddbc..119b1abd 100644 --- a/src/mof/qdirectedrelationship_p.h +++ b/src/mof/qdirectedrelationship_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -76,7 +79,9 @@ public: void removeTarget(QElement *target); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qelement.cpp b/src/mof/qelement.cpp index 3217c2a4..606a081f 100644 --- a/src/mof/qelement.cpp +++ b/src/mof/qelement.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QElementPrivate::QElementPrivate() : owner(0) @@ -238,26 +241,26 @@ void QElement::delete_() void QElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Elements owned by this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::owner"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Element that owns this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::ownedElement"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Comments owned by this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Elements owned by this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::owner"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Element that owns this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::ownedElement"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Comments owned by this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QMofObject::setPropertyData(); } @@ -270,7 +273,9 @@ void QElement::allOwnedElements(QSet<QElement *> &allOwnedElements_) const element->allOwnedElements(allOwnedElements_); } -#include "moc_qelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qelement.cpp" diff --git a/src/mof/qelement.h b/src/mof/qelement.h index c9b23c67..dd05f8a8 100644 --- a/src/mof/qelement.h +++ b/src/mof/qelement.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,9 +68,9 @@ class Q_MOF_EXPORT QElement : public QMofObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) Q_DISABLE_COPY(QElement) Q_DECLARE_PRIVATE(QElement) @@ -100,7 +103,9 @@ private: void allOwnedElements(QSet<QElement *> &allOwnedElements_) const; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qelement_p.h b/src/mof/qelement_p.h index f565b16b..fec8301c 100644 --- a/src/mof/qelement_p.h +++ b/src/mof/qelement_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -78,7 +81,9 @@ public: void setOwner(QElement *owner); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qelementimport.cpp b/src/mof/qelementimport.cpp index e0e11789..a55cdf18 100644 --- a/src/mof/qelementimport.cpp +++ b/src/mof/qelementimport.cpp @@ -47,10 +47,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QElementImportPrivate::QElementImportPrivate() : - visibility(QtMof::VisibilityPublic), + visibility(QtMofNS::VisibilityPublic), importedElement(0), importingNamespace(0) { @@ -112,7 +115,7 @@ void QElementImport::setAlias(QString alias) /*! Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import. */ -QtMof::VisibilityKind QElementImport::visibility() const +QtMofNS::VisibilityKind QElementImport::visibility() const { // This is a read-write attribute @@ -120,7 +123,7 @@ QtMof::VisibilityKind QElementImport::visibility() const return d->visibility; } -void QElementImport::setVisibility(QtMof::VisibilityKind visibility) +void QElementImport::setVisibility(QtMofNS::VisibilityKind visibility) { // This is a read-write attribute @@ -133,7 +136,7 @@ void QElementImport::setVisibility(QtMof::VisibilityKind visibility) void QElementImport::unsetVisibility() { - setVisibility(QtMof::VisibilityPublic); + setVisibility(QtMofNS::VisibilityPublic); Q_D(QElementImport); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -221,38 +224,40 @@ QString QElementImport::getName() const void QElementImport::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the name that should be added to the namespace of the importing package in lieu of the name of the imported packagable element. The aliased name must not clash with any other member name in the importing package. By default, no alias is used."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the PackageableElement whose name is to be added to a Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports a PackageableElement from another Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::elementImport"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the name that should be added to the namespace of the importing package in lieu of the name of the imported packagable element. The aliased name must not clash with any other member name in the importing package. By default, no alias is used."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the PackageableElement whose name is to be added to a Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports a PackageableElement from another Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::elementImport"); QDirectedRelationship::setPropertyData(); } -#include "moc_qelementimport.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qelementimport.cpp" diff --git a/src/mof/qelementimport.h b/src/mof/qelementimport.h index 0e874d77..ae9d3d0a 100644 --- a/src/mof/qelementimport.h +++ b/src/mof/qelementimport.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -69,9 +72,9 @@ class Q_MOF_EXPORT QElementImport : public QDirectedRelationship Q_OBJECT Q_PROPERTY(QString alias READ alias WRITE setAlias) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackageableElement * importedElement READ importedElement WRITE setImportedElement) - Q_PROPERTY(QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtMof::QPackageableElement * importedElement READ importedElement WRITE setImportedElement) + Q_PROPERTY(QtMof::QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) Q_DISABLE_COPY(QElementImport) Q_DECLARE_PRIVATE(QElementImport) @@ -83,8 +86,8 @@ public: // Attributes from QElementImport Q_INVOKABLE QString alias() const; Q_INVOKABLE void setAlias(QString alias); - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from QElementImport @@ -102,7 +105,9 @@ protected: explicit QElementImport(QElementImportPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qelementimport_p.h b/src/mof/qelementimport_p.h index a80ef959..2d535bb9 100644 --- a/src/mof/qelementimport_p.h +++ b/src/mof/qelementimport_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -72,12 +75,14 @@ public: virtual ~QElementImportPrivate(); QString alias; - QtMof::VisibilityKind visibility; + QtMofNS::VisibilityKind visibility; QPackageableElement *importedElement; QNamespace *importingNamespace; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qenumeration.cpp b/src/mof/qenumeration.cpp index e3227ea6..32d2a541 100644 --- a/src/mof/qenumeration.cpp +++ b/src/mof/qenumeration.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QEnumerationPrivate::QEnumerationPrivate() { @@ -129,17 +132,19 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) void QEnumeration::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of literals for this Enumeration."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumerationLiteral::enumeration"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of literals for this Enumeration."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumerationLiteral::enumeration"); QDataType::setPropertyData(); } -#include "moc_qenumeration.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qenumeration.cpp" diff --git a/src/mof/qenumeration.h b/src/mof/qenumeration.h index 0f8a2224..4f5957d5 100644 --- a/src/mof/qenumeration.h +++ b/src/mof/qenumeration.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -64,7 +67,7 @@ class Q_MOF_EXPORT QEnumeration : public QDataType { Q_OBJECT - Q_PROPERTY(QList<QEnumerationLiteral *> ownedLiterals READ ownedLiterals) + Q_PROPERTY(QList<QtMof::QEnumerationLiteral *> ownedLiterals READ ownedLiterals) Q_DISABLE_COPY(QEnumeration) Q_DECLARE_PRIVATE(QEnumeration) @@ -84,7 +87,9 @@ protected: explicit QEnumeration(QEnumerationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qenumeration_p.h b/src/mof/qenumeration_p.h index 228804d4..980662ce 100644 --- a/src/mof/qenumeration_p.h +++ b/src/mof/qenumeration_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -70,7 +73,9 @@ public: QList<QEnumerationLiteral *> ownedLiterals; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qenumerationliteral.cpp b/src/mof/qenumerationliteral.cpp index 0c5810f1..2e7997b2 100644 --- a/src/mof/qenumerationliteral.cpp +++ b/src/mof/qenumerationliteral.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QEnumerationLiteralPrivate::QEnumerationLiteralPrivate() : enumeration(0) @@ -131,24 +134,26 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration) void QEnumerationLiteral::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier of this EnumerationLiteral derived to be equal to its enumeration."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInstanceSpecification::classifiers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Enumeration that this EnumerationLiteral is a member of."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumeration::ownedLiteral"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier of this EnumerationLiteral derived to be equal to its enumeration."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInstanceSpecification::classifiers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Enumeration that this EnumerationLiteral is a member of."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumeration::ownedLiteral"); QInstanceSpecification::setPropertyData(); } -#include "moc_qenumerationliteral.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qenumerationliteral.cpp" diff --git a/src/mof/qenumerationliteral.h b/src/mof/qenumerationliteral.h index 4566e163..3f670e99 100644 --- a/src/mof/qenumerationliteral.h +++ b/src/mof/qenumerationliteral.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -61,8 +64,8 @@ class Q_MOF_EXPORT QEnumerationLiteral : public QInstanceSpecification { Q_OBJECT - Q_PROPERTY(QEnumeration * classifier READ classifier STORED false) - Q_PROPERTY(QEnumeration * enumeration READ enumeration WRITE setEnumeration) + Q_PROPERTY(QtMof::QEnumeration * classifier READ classifier STORED false) + Q_PROPERTY(QtMof::QEnumeration * enumeration READ enumeration WRITE setEnumeration) Q_DISABLE_COPY(QEnumerationLiteral) Q_DECLARE_PRIVATE(QEnumerationLiteral) @@ -82,7 +85,9 @@ protected: explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qenumerationliteral_p.h b/src/mof/qenumerationliteral_p.h index 42202085..fe651362 100644 --- a/src/mof/qenumerationliteral_p.h +++ b/src/mof/qenumerationliteral_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -67,7 +70,9 @@ public: QEnumeration *enumeration; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qexception.cpp b/src/mof/qexception.cpp index 73629e1f..d1d34848 100644 --- a/src/mof/qexception.cpp +++ b/src/mof/qexception.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QExceptionPrivate::QExceptionPrivate() : elementInError(0), @@ -135,31 +138,33 @@ void QException::setObjectInError(QElement *objectInError) void QException::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("description")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("description")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("description")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("description")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("description")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("description")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("description")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("description")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("description")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("description")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("description")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("description")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("elementInError")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QException")][QString::fromLatin1("objectInError")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qexception.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qexception.cpp" diff --git a/src/mof/qexception.h b/src/mof/qexception.h index f590e3ca..6cc2bd06 100644 --- a/src/mof/qexception.h +++ b/src/mof/qexception.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,8 +68,8 @@ class Q_MOF_EXPORT QException : public QWrappedObject Q_OBJECT Q_PROPERTY(QString description READ description WRITE setDescription) - Q_PROPERTY(QElement * elementInError READ elementInError WRITE setElementInError) - Q_PROPERTY(QElement * objectInError READ objectInError WRITE setObjectInError) + Q_PROPERTY(QtMof::QElement * elementInError READ elementInError WRITE setElementInError) + Q_PROPERTY(QtMof::QElement * objectInError READ objectInError WRITE setObjectInError) Q_DISABLE_COPY(QException) Q_DECLARE_PRIVATE(QException) @@ -89,7 +92,9 @@ protected: explicit QException(QExceptionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qexception_p.h b/src/mof/qexception_p.h index 7b644c8b..e8599f99 100644 --- a/src/mof/qexception_p.h +++ b/src/mof/qexception_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -72,7 +75,9 @@ public: QElement *objectInError; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qexpression.cpp b/src/mof/qexpression.cpp index 0c88433b..09e38b5a 100644 --- a/src/mof/qexpression.cpp +++ b/src/mof/qexpression.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QExpressionPrivate::QExpressionPrivate() { @@ -146,24 +149,26 @@ void QExpression::removeOperand(QValueSpecification *operand) void QExpression::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The symbol associated with the node in the expression tree."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a sequence of operands."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The symbol associated with the node in the expression tree."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a sequence of operands."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qexpression.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qexpression.cpp" diff --git a/src/mof/qexpression.h b/src/mof/qexpression.h index 39a451c2..35096cdf 100644 --- a/src/mof/qexpression.h +++ b/src/mof/qexpression.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -63,7 +66,7 @@ class Q_MOF_EXPORT QExpression : public QValueSpecification Q_OBJECT Q_PROPERTY(QString symbol READ symbol WRITE setSymbol) - Q_PROPERTY(QList<QValueSpecification *> operands READ operands) + Q_PROPERTY(QList<QtMof::QValueSpecification *> operands READ operands) Q_DISABLE_COPY(QExpression) Q_DECLARE_PRIVATE(QExpression) @@ -87,7 +90,9 @@ protected: explicit QExpression(QExpressionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qexpression_p.h b/src/mof/qexpression_p.h index 2de91824..e3759fa2 100644 --- a/src/mof/qexpression_p.h +++ b/src/mof/qexpression_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QExpression; @@ -69,7 +72,9 @@ public: QList<QValueSpecification *> operands; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qextent.cpp b/src/mof/qextent.cpp index ac5648a4..b531a3a7 100644 --- a/src/mof/qextent.cpp +++ b/src/mof/qextent.cpp @@ -50,7 +50,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QExtentPrivate::QExtentPrivate() { @@ -133,7 +136,9 @@ void QExtent::setPropertyData() QMofObject::setPropertyData(); } -#include "moc_qextent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qextent.cpp" diff --git a/src/mof/qextent.h b/src/mof/qextent.h index facdd1cd..76ca2cf5 100644 --- a/src/mof/qextent.h +++ b/src/mof/qextent.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -89,7 +92,9 @@ protected: explicit QExtent(QExtentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qextent_p.h b/src/mof/qextent_p.h index ac235e33..4a18f819 100644 --- a/src/mof/qextent_p.h +++ b/src/mof/qextent_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -73,7 +76,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qfactory.cpp b/src/mof/qfactory.cpp index 33e17ab6..d74e13db 100644 --- a/src/mof/qfactory.cpp +++ b/src/mof/qfactory.cpp @@ -52,7 +52,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QFactoryPrivate::QFactoryPrivate() : package(0) @@ -149,17 +152,19 @@ QLink *QFactory::createLink(const QAssociation *association, const QElement *fir void QFactory::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QFactory")][QString::fromLatin1("package")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFactory")][QString::fromLatin1("package")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QFactory")][QString::fromLatin1("package")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFactory")][QString::fromLatin1("package")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFactory")][QString::fromLatin1("package")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFactory")][QString::fromLatin1("package")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFactory")][QString::fromLatin1("package")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFactory")][QString::fromLatin1("package")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFactory")][QString::fromLatin1("package")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFactory")][QString::fromLatin1("package")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFactory")][QString::fromLatin1("package")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFactory")][QString::fromLatin1("package")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qfactory.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qfactory.cpp" diff --git a/src/mof/qfactory.h b/src/mof/qfactory.h index a818ab2e..928e6294 100644 --- a/src/mof/qfactory.h +++ b/src/mof/qfactory.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -71,7 +74,7 @@ class Q_MOF_EXPORT QFactory : public QElement { Q_OBJECT - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtMof::QPackage * package READ package WRITE setPackage) Q_DISABLE_COPY(QFactory) Q_DECLARE_PRIVATE(QFactory) @@ -97,7 +100,9 @@ protected: explicit QFactory(QFactoryPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qfactory_p.h b/src/mof/qfactory_p.h index 4cbaf3af..a3de856a 100644 --- a/src/mof/qfactory_p.h +++ b/src/mof/qfactory_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -77,7 +80,9 @@ public: QPackage *package; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qfeature.cpp b/src/mof/qfeature.cpp index 29c6b939..0dbecfea 100644 --- a/src/mof/qfeature.cpp +++ b/src/mof/qfeature.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QFeaturePrivate::QFeaturePrivate() : isStatic(false) @@ -160,24 +163,26 @@ QSet<QClassifier *> QFeature::featuringClassifiers() const void QFeature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether this feature characterizes individual instances classified by the classifier (false) or the classifier itself (true)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Classifiers that have this Feature as a feature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::feature"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether this feature characterizes individual instances classified by the classifier (false) or the classifier itself (true)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Classifiers that have this Feature as a feature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::feature"); QRedefinableElement::setPropertyData(); } -#include "moc_qfeature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qfeature.cpp" diff --git a/src/mof/qfeature.h b/src/mof/qfeature.h index 331ec8e4..bad74442 100644 --- a/src/mof/qfeature.h +++ b/src/mof/qfeature.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,7 +68,7 @@ class Q_MOF_EXPORT QFeature : public QRedefinableElement Q_OBJECT Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtMof::QClassifier *> featuringClassifiers READ featuringClassifiers) Q_DISABLE_COPY(QFeature) Q_DECLARE_PRIVATE(QFeature) @@ -91,7 +94,9 @@ protected: explicit QFeature(QFeaturePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qfeature_p.h b/src/mof/qfeature_p.h index 05c448c5..247cbee0 100644 --- a/src/mof/qfeature_p.h +++ b/src/mof/qfeature_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -74,7 +77,9 @@ public: void removeFeaturingClassifier(QClassifier *featuringClassifier); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qgeneralization.cpp b/src/mof/qgeneralization.cpp index 0ad109db..3629efb8 100644 --- a/src/mof/qgeneralization.cpp +++ b/src/mof/qgeneralization.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QGeneralizationPrivate::QGeneralizationPrivate() : isSubstitutable(true), @@ -189,31 +192,33 @@ void QGeneralization::setGeneral(QClassifier *general) void QGeneralization::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether the specific classifier can be used wherever the general classifier can be used. If true, the execution traces of the specific classifier will be a superset of the execution traces of the general classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the specializing classifier in the Generalization relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::generalization"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the general classifier in the Generalization relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether the specific classifier can be used wherever the general classifier can be used. If true, the execution traces of the specific classifier will be a superset of the execution traces of the general classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the specializing classifier in the Generalization relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::generalization"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the general classifier in the Generalization relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDirectedRelationship::setPropertyData(); } -#include "moc_qgeneralization.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qgeneralization.cpp" diff --git a/src/mof/qgeneralization.h b/src/mof/qgeneralization.h index 7dce1007..810da276 100644 --- a/src/mof/qgeneralization.h +++ b/src/mof/qgeneralization.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -62,8 +65,8 @@ class Q_MOF_EXPORT QGeneralization : public QDirectedRelationship Q_OBJECT Q_PROPERTY(bool isSubstitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable) - Q_PROPERTY(QClassifier * specific READ specific WRITE setSpecific) - Q_PROPERTY(QClassifier * general READ general WRITE setGeneral) + Q_PROPERTY(QtMof::QClassifier * specific READ specific WRITE setSpecific) + Q_PROPERTY(QtMof::QClassifier * general READ general WRITE setGeneral) Q_DISABLE_COPY(QGeneralization) Q_DECLARE_PRIVATE(QGeneralization) @@ -89,7 +92,9 @@ protected: explicit QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qgeneralization_p.h b/src/mof/qgeneralization_p.h index 768e178a..f70301f5 100644 --- a/src/mof/qgeneralization_p.h +++ b/src/mof/qgeneralization_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -69,7 +72,9 @@ public: QClassifier *general; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qinstancespecification.cpp b/src/mof/qinstancespecification.cpp index 20d0997b..97bfde72 100644 --- a/src/mof/qinstancespecification.cpp +++ b/src/mof/qinstancespecification.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QInstanceSpecificationPrivate::QInstanceSpecificationPrivate() : specification(0) @@ -192,31 +195,33 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) void QInstanceSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A specification of how to compute, derive, or construct the instance."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QSlot::owningInstance"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A specification of how to compute, derive, or construct the instance."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QSlot::owningInstance"); QPackageableElement::setPropertyData(); } -#include "moc_qinstancespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qinstancespecification.cpp" diff --git a/src/mof/qinstancespecification.h b/src/mof/qinstancespecification.h index eabb4c01..22ab2e80 100644 --- a/src/mof/qinstancespecification.h +++ b/src/mof/qinstancespecification.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -66,9 +69,9 @@ class Q_MOF_EXPORT QInstanceSpecification : public QPackageableElement { Q_OBJECT - Q_PROPERTY(QSet<QClassifier *> classifiers READ classifiers) - Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(QSet<QSlot *> slots_ READ slots_) + Q_PROPERTY(QSet<QtMof::QClassifier *> classifiers READ classifiers) + Q_PROPERTY(QtMof::QValueSpecification * specification READ specification WRITE setSpecification) + Q_PROPERTY(QSet<QtMof::QSlot *> slots_ READ slots_) Q_DISABLE_COPY(QInstanceSpecification) Q_DECLARE_PRIVATE(QInstanceSpecification) @@ -93,7 +96,9 @@ protected: explicit QInstanceSpecification(QInstanceSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qinstancespecification_p.h b/src/mof/qinstancespecification_p.h index 4866d520..0cc84602 100644 --- a/src/mof/qinstancespecification_p.h +++ b/src/mof/qinstancespecification_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -74,7 +77,9 @@ public: QSet<QSlot *> slots_; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qinstancevalue.cpp b/src/mof/qinstancevalue.cpp index 3a97e72a..cd91f3ad 100644 --- a/src/mof/qinstancevalue.cpp +++ b/src/mof/qinstancevalue.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QInstanceValuePrivate::QInstanceValuePrivate() : instance(0) @@ -108,17 +111,19 @@ void QInstanceValue::setInstance(QInstanceSpecification *instance) void QInstanceValue::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance that is the specified value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance that is the specified value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qinstancevalue.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qinstancevalue.cpp" diff --git a/src/mof/qinstancevalue.h b/src/mof/qinstancevalue.h index 460c8912..82d67f46 100644 --- a/src/mof/qinstancevalue.h +++ b/src/mof/qinstancevalue.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -61,7 +64,7 @@ class Q_MOF_EXPORT QInstanceValue : public QValueSpecification { Q_OBJECT - Q_PROPERTY(QInstanceSpecification * instance READ instance WRITE setInstance) + Q_PROPERTY(QtMof::QInstanceSpecification * instance READ instance WRITE setInstance) Q_DISABLE_COPY(QInstanceValue) Q_DECLARE_PRIVATE(QInstanceValue) @@ -80,7 +83,9 @@ protected: explicit QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qinstancevalue_p.h b/src/mof/qinstancevalue_p.h index 120b4e2a..345f2e29 100644 --- a/src/mof/qinstancevalue_p.h +++ b/src/mof/qinstancevalue_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -67,7 +70,9 @@ public: QInstanceSpecification *instance; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qlink.cpp b/src/mof/qlink.cpp index 725df508..e16fea01 100644 --- a/src/mof/qlink.cpp +++ b/src/mof/qlink.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLinkPrivate::QLinkPrivate() : association(0), @@ -150,31 +153,33 @@ void QLink::delete_() void QLink::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("secondElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLink")][QString::fromLatin1("firstElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QMofObject::setPropertyData(); } -#include "moc_qlink.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qlink.cpp" diff --git a/src/mof/qlink.h b/src/mof/qlink.h index 5e947d99..538a0838 100644 --- a/src/mof/qlink.h +++ b/src/mof/qlink.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -62,9 +65,9 @@ class Q_MOF_EXPORT QLink : public QMofObject { Q_OBJECT - Q_PROPERTY(QAssociation * association READ association WRITE setAssociation) - Q_PROPERTY(QElement * secondElement READ secondElement WRITE setSecondElement) - Q_PROPERTY(QElement * firstElement READ firstElement WRITE setFirstElement) + Q_PROPERTY(QtMof::QAssociation * association READ association WRITE setAssociation) + Q_PROPERTY(QtMof::QElement * secondElement READ secondElement WRITE setSecondElement) + Q_PROPERTY(QtMof::QElement * firstElement READ firstElement WRITE setFirstElement) Q_DISABLE_COPY(QLink) Q_DECLARE_PRIVATE(QLink) @@ -91,7 +94,9 @@ protected: explicit QLink(QLinkPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qlink_p.h b/src/mof/qlink_p.h index 94ec9689..870ef48f 100644 --- a/src/mof/qlink_p.h +++ b/src/mof/qlink_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -70,7 +73,9 @@ public: QElement *firstElement; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralboolean.cpp b/src/mof/qliteralboolean.cpp index 53b35d14..9c48088a 100644 --- a/src/mof/qliteralboolean.cpp +++ b/src/mof/qliteralboolean.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLiteralBooleanPrivate::QLiteralBooleanPrivate() : value(false) @@ -134,17 +137,19 @@ bool QLiteralBoolean::isComputable() const void QLiteralBoolean::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Boolean value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Boolean value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralboolean.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qliteralboolean.cpp" diff --git a/src/mof/qliteralboolean.h b/src/mof/qliteralboolean.h index 08baf93c..f08c8631 100644 --- a/src/mof/qliteralboolean.h +++ b/src/mof/qliteralboolean.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -82,7 +85,9 @@ protected: explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralboolean_p.h b/src/mof/qliteralboolean_p.h index 3c68655b..348cf8a1 100644 --- a/src/mof/qliteralboolean_p.h +++ b/src/mof/qliteralboolean_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QLiteralBoolean; @@ -64,7 +67,9 @@ public: bool value; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralinteger.cpp b/src/mof/qliteralinteger.cpp index a884194b..abbde0af 100644 --- a/src/mof/qliteralinteger.cpp +++ b/src/mof/qliteralinteger.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLiteralIntegerPrivate::QLiteralIntegerPrivate() { @@ -125,17 +128,19 @@ bool QLiteralInteger::isComputable() const void QLiteralInteger::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Integer value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Integer value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralinteger.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qliteralinteger.cpp" diff --git a/src/mof/qliteralinteger.h b/src/mof/qliteralinteger.h index 91783cde..7b52b495 100644 --- a/src/mof/qliteralinteger.h +++ b/src/mof/qliteralinteger.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -81,7 +84,9 @@ protected: explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralinteger_p.h b/src/mof/qliteralinteger_p.h index e0510cde..6b6a6221 100644 --- a/src/mof/qliteralinteger_p.h +++ b/src/mof/qliteralinteger_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QLiteralInteger; @@ -64,7 +67,9 @@ public: qint32 value; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralnull.cpp b/src/mof/qliteralnull.cpp index b5f98008..78dd24dd 100644 --- a/src/mof/qliteralnull.cpp +++ b/src/mof/qliteralnull.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLiteralNullPrivate::QLiteralNullPrivate() { @@ -103,7 +106,9 @@ void QLiteralNull::setPropertyData() QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralnull.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qliteralnull.cpp" diff --git a/src/mof/qliteralnull.h b/src/mof/qliteralnull.h index 628f9555..b0528163 100644 --- a/src/mof/qliteralnull.h +++ b/src/mof/qliteralnull.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -75,7 +78,9 @@ protected: explicit QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralnull_p.h b/src/mof/qliteralnull_p.h index 0ea0a9fd..13360a6d 100644 --- a/src/mof/qliteralnull_p.h +++ b/src/mof/qliteralnull_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QLiteralNull; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralreal.cpp b/src/mof/qliteralreal.cpp index ae39a65e..20069c58 100644 --- a/src/mof/qliteralreal.cpp +++ b/src/mof/qliteralreal.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLiteralRealPrivate::QLiteralRealPrivate() { @@ -122,17 +125,19 @@ qreal QLiteralReal::realValue() const void QLiteralReal::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralreal.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qliteralreal.cpp" diff --git a/src/mof/qliteralreal.h b/src/mof/qliteralreal.h index d83302de..1477845f 100644 --- a/src/mof/qliteralreal.h +++ b/src/mof/qliteralreal.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -81,7 +84,9 @@ protected: explicit QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralreal_p.h b/src/mof/qliteralreal_p.h index cf44db75..200ef2cf 100644 --- a/src/mof/qliteralreal_p.h +++ b/src/mof/qliteralreal_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QLiteralReal; @@ -64,7 +67,9 @@ public: qreal value; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralspecification.cpp b/src/mof/qliteralspecification.cpp index a2c48e53..0807e179 100644 --- a/src/mof/qliteralspecification.cpp +++ b/src/mof/qliteralspecification.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLiteralSpecificationPrivate::QLiteralSpecificationPrivate() { @@ -83,7 +86,9 @@ void QLiteralSpecification::setPropertyData() QValueSpecification::setPropertyData(); } -#include "moc_qliteralspecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qliteralspecification.cpp" diff --git a/src/mof/qliteralspecification.h b/src/mof/qliteralspecification.h index 05e01b4b..9f3a8ea4 100644 --- a/src/mof/qliteralspecification.h +++ b/src/mof/qliteralspecification.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -71,7 +74,9 @@ protected: explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralspecification_p.h b/src/mof/qliteralspecification_p.h index 7d65cd36..bc9532dd 100644 --- a/src/mof/qliteralspecification_p.h +++ b/src/mof/qliteralspecification_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralstring.cpp b/src/mof/qliteralstring.cpp index bceab3af..de6e40ad 100644 --- a/src/mof/qliteralstring.cpp +++ b/src/mof/qliteralstring.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLiteralStringPrivate::QLiteralStringPrivate() { @@ -125,17 +128,19 @@ QString QLiteralString::stringValue() const void QLiteralString::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified String value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified String value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralstring.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qliteralstring.cpp" diff --git a/src/mof/qliteralstring.h b/src/mof/qliteralstring.h index 71565371..586fd3ef 100644 --- a/src/mof/qliteralstring.h +++ b/src/mof/qliteralstring.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -84,7 +87,9 @@ protected: explicit QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralstring_p.h b/src/mof/qliteralstring_p.h index 4922546e..d2709dcf 100644 --- a/src/mof/qliteralstring_p.h +++ b/src/mof/qliteralstring_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QLiteralString; @@ -67,7 +70,9 @@ public: QString value; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralunlimitednatural.cpp b/src/mof/qliteralunlimitednatural.cpp index 125e01bb..053aee92 100644 --- a/src/mof/qliteralunlimitednatural.cpp +++ b/src/mof/qliteralunlimitednatural.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QLiteralUnlimitedNaturalPrivate::QLiteralUnlimitedNaturalPrivate() : value(0) @@ -134,17 +137,19 @@ qint32 QLiteralUnlimitedNatural::unlimitedValue() const void QLiteralUnlimitedNatural::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified UnlimitedNatural value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified UnlimitedNatural value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralunlimitednatural.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qliteralunlimitednatural.cpp" diff --git a/src/mof/qliteralunlimitednatural.h b/src/mof/qliteralunlimitednatural.h index e539b60e..3acc07b4 100644 --- a/src/mof/qliteralunlimitednatural.h +++ b/src/mof/qliteralunlimitednatural.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -82,7 +85,9 @@ protected: explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qliteralunlimitednatural_p.h b/src/mof/qliteralunlimitednatural_p.h index c3ac554a..368e3deb 100644 --- a/src/mof/qliteralunlimitednatural_p.h +++ b/src/mof/qliteralunlimitednatural_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QLiteralUnlimitedNatural; @@ -64,7 +67,9 @@ public: qint32 value; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qmofmetamodel.cpp b/src/mof/qmofmetamodel.cpp index d65de0e5..7df9248a 100644 --- a/src/mof/qmofmetamodel.cpp +++ b/src/mof/qmofmetamodel.cpp @@ -41,172 +41,172 @@ #include "qmofmetamodel.h" -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ void QMofMetaModel::init(QScriptEngine *scriptEngine) { - qRegisterMetaType<QArgument *>("QtMof::QArgument *"); - qRegisterMetaType<QList<QArgument *>>("QList<QtMof::QArgument *>"); - qRegisterMetaType<QSet<QArgument *>>("QSet<QtMof::QArgument *>"); - qRegisterMetaType<QAssociation *>("QtMof::QAssociation *"); - qRegisterMetaType<QList<QAssociation *>>("QList<QtMof::QAssociation *>"); - qRegisterMetaType<QSet<QAssociation *>>("QSet<QtMof::QAssociation *>"); - qRegisterMetaType<QBehavioralFeature *>("QtMof::QBehavioralFeature *"); - qRegisterMetaType<QList<QBehavioralFeature *>>("QList<QtMof::QBehavioralFeature *>"); - qRegisterMetaType<QSet<QBehavioralFeature *>>("QSet<QtMof::QBehavioralFeature *>"); - qMetaTypeId<QClass *>(); - qMetaTypeId<QList<QClass *>>(); - qMetaTypeId<QSet<QClass *>>(); - qRegisterMetaType<QClass *>("QtMof::QClass *"); - qRegisterMetaType<QList<QClass *>>("QList<QtMof::QClass *>"); - qRegisterMetaType<QSet<QClass *>>("QSet<QtMof::QClass *>"); - qRegisterMetaType<QClassifier *>("QtMof::QClassifier *"); - qRegisterMetaType<QList<QClassifier *>>("QList<QtMof::QClassifier *>"); - qRegisterMetaType<QSet<QClassifier *>>("QSet<QtMof::QClassifier *>"); - qRegisterMetaType<QComment *>("QtMof::QComment *"); - qRegisterMetaType<QList<QComment *>>("QList<QtMof::QComment *>"); - qRegisterMetaType<QSet<QComment *>>("QSet<QtMof::QComment *>"); - qRegisterMetaType<QConstraint *>("QtMof::QConstraint *"); - qRegisterMetaType<QList<QConstraint *>>("QList<QtMof::QConstraint *>"); - qRegisterMetaType<QSet<QConstraint *>>("QSet<QtMof::QConstraint *>"); - qRegisterMetaType<QDataType *>("QtMof::QDataType *"); - qRegisterMetaType<QList<QDataType *>>("QList<QtMof::QDataType *>"); - qRegisterMetaType<QSet<QDataType *>>("QSet<QtMof::QDataType *>"); - qRegisterMetaType<QDirectedRelationship *>("QtMof::QDirectedRelationship *"); - qRegisterMetaType<QList<QDirectedRelationship *>>("QList<QtMof::QDirectedRelationship *>"); - qRegisterMetaType<QSet<QDirectedRelationship *>>("QSet<QtMof::QDirectedRelationship *>"); - qRegisterMetaType<QElement *>("QtMof::QElement *"); - qRegisterMetaType<QList<QElement *>>("QList<QtMof::QElement *>"); - qRegisterMetaType<QSet<QElement *>>("QSet<QtMof::QElement *>"); - qRegisterMetaType<QElementImport *>("QtMof::QElementImport *"); - qRegisterMetaType<QList<QElementImport *>>("QList<QtMof::QElementImport *>"); - qRegisterMetaType<QSet<QElementImport *>>("QSet<QtMof::QElementImport *>"); - qRegisterMetaType<QEnumeration *>("QtMof::QEnumeration *"); - qRegisterMetaType<QList<QEnumeration *>>("QList<QtMof::QEnumeration *>"); - qRegisterMetaType<QSet<QEnumeration *>>("QSet<QtMof::QEnumeration *>"); - qRegisterMetaType<QEnumerationLiteral *>("QtMof::QEnumerationLiteral *"); - qRegisterMetaType<QList<QEnumerationLiteral *>>("QList<QtMof::QEnumerationLiteral *>"); - qRegisterMetaType<QSet<QEnumerationLiteral *>>("QSet<QtMof::QEnumerationLiteral *>"); - qRegisterMetaType<QException *>("QtMof::QException *"); - qRegisterMetaType<QList<QException *>>("QList<QtMof::QException *>"); - qRegisterMetaType<QSet<QException *>>("QSet<QtMof::QException *>"); - qRegisterMetaType<QExpression *>("QtMof::QExpression *"); - qRegisterMetaType<QList<QExpression *>>("QList<QtMof::QExpression *>"); - qRegisterMetaType<QSet<QExpression *>>("QSet<QtMof::QExpression *>"); - qRegisterMetaType<QExtent *>("QtMof::QExtent *"); - qRegisterMetaType<QList<QExtent *>>("QList<QtMof::QExtent *>"); - qRegisterMetaType<QSet<QExtent *>>("QSet<QtMof::QExtent *>"); - qRegisterMetaType<QFactory *>("QtMof::QFactory *"); - qRegisterMetaType<QList<QFactory *>>("QList<QtMof::QFactory *>"); - qRegisterMetaType<QSet<QFactory *>>("QSet<QtMof::QFactory *>"); - qRegisterMetaType<QFeature *>("QtMof::QFeature *"); - qRegisterMetaType<QList<QFeature *>>("QList<QtMof::QFeature *>"); - qRegisterMetaType<QSet<QFeature *>>("QSet<QtMof::QFeature *>"); - qRegisterMetaType<QGeneralization *>("QtMof::QGeneralization *"); - qRegisterMetaType<QList<QGeneralization *>>("QList<QtMof::QGeneralization *>"); - qRegisterMetaType<QSet<QGeneralization *>>("QSet<QtMof::QGeneralization *>"); - qRegisterMetaType<QInstanceSpecification *>("QtMof::QInstanceSpecification *"); - qRegisterMetaType<QList<QInstanceSpecification *>>("QList<QtMof::QInstanceSpecification *>"); - qRegisterMetaType<QSet<QInstanceSpecification *>>("QSet<QtMof::QInstanceSpecification *>"); - qRegisterMetaType<QInstanceValue *>("QtMof::QInstanceValue *"); - qRegisterMetaType<QList<QInstanceValue *>>("QList<QtMof::QInstanceValue *>"); - qRegisterMetaType<QSet<QInstanceValue *>>("QSet<QtMof::QInstanceValue *>"); - qRegisterMetaType<QLink *>("QtMof::QLink *"); - qRegisterMetaType<QList<QLink *>>("QList<QtMof::QLink *>"); - qRegisterMetaType<QSet<QLink *>>("QSet<QtMof::QLink *>"); - qRegisterMetaType<QLiteralBoolean *>("QtMof::QLiteralBoolean *"); - qRegisterMetaType<QList<QLiteralBoolean *>>("QList<QtMof::QLiteralBoolean *>"); - qRegisterMetaType<QSet<QLiteralBoolean *>>("QSet<QtMof::QLiteralBoolean *>"); - qRegisterMetaType<QLiteralInteger *>("QtMof::QLiteralInteger *"); - qRegisterMetaType<QList<QLiteralInteger *>>("QList<QtMof::QLiteralInteger *>"); - qRegisterMetaType<QSet<QLiteralInteger *>>("QSet<QtMof::QLiteralInteger *>"); - qRegisterMetaType<QLiteralNull *>("QtMof::QLiteralNull *"); - qRegisterMetaType<QList<QLiteralNull *>>("QList<QtMof::QLiteralNull *>"); - qRegisterMetaType<QSet<QLiteralNull *>>("QSet<QtMof::QLiteralNull *>"); - qRegisterMetaType<QLiteralReal *>("QtMof::QLiteralReal *"); - qRegisterMetaType<QList<QLiteralReal *>>("QList<QtMof::QLiteralReal *>"); - qRegisterMetaType<QSet<QLiteralReal *>>("QSet<QtMof::QLiteralReal *>"); - qRegisterMetaType<QLiteralSpecification *>("QtMof::QLiteralSpecification *"); - qRegisterMetaType<QList<QLiteralSpecification *>>("QList<QtMof::QLiteralSpecification *>"); - qRegisterMetaType<QSet<QLiteralSpecification *>>("QSet<QtMof::QLiteralSpecification *>"); - qRegisterMetaType<QLiteralString *>("QtMof::QLiteralString *"); - qRegisterMetaType<QList<QLiteralString *>>("QList<QtMof::QLiteralString *>"); - qRegisterMetaType<QSet<QLiteralString *>>("QSet<QtMof::QLiteralString *>"); - qRegisterMetaType<QLiteralUnlimitedNatural *>("QtMof::QLiteralUnlimitedNatural *"); - qRegisterMetaType<QList<QLiteralUnlimitedNatural *>>("QList<QtMof::QLiteralUnlimitedNatural *>"); - qRegisterMetaType<QSet<QLiteralUnlimitedNatural *>>("QSet<QtMof::QLiteralUnlimitedNatural *>"); - qRegisterMetaType<QMofObject *>("QtMof::QMofObject *"); - qRegisterMetaType<QList<QMofObject *>>("QList<QtMof::QMofObject *>"); - qRegisterMetaType<QSet<QMofObject *>>("QSet<QtMof::QMofObject *>"); - qRegisterMetaType<QMultiplicityElement *>("QtMof::QMultiplicityElement *"); - qRegisterMetaType<QList<QMultiplicityElement *>>("QList<QtMof::QMultiplicityElement *>"); - qRegisterMetaType<QSet<QMultiplicityElement *>>("QSet<QtMof::QMultiplicityElement *>"); - qRegisterMetaType<QNamedElement *>("QtMof::QNamedElement *"); - qRegisterMetaType<QList<QNamedElement *>>("QList<QtMof::QNamedElement *>"); - qRegisterMetaType<QSet<QNamedElement *>>("QSet<QtMof::QNamedElement *>"); - qRegisterMetaType<QNamespace *>("QtMof::QNamespace *"); - qRegisterMetaType<QList<QNamespace *>>("QList<QtMof::QNamespace *>"); - qRegisterMetaType<QSet<QNamespace *>>("QSet<QtMof::QNamespace *>"); - qRegisterMetaType<QOpaqueExpression *>("QtMof::QOpaqueExpression *"); - qRegisterMetaType<QList<QOpaqueExpression *>>("QList<QtMof::QOpaqueExpression *>"); - qRegisterMetaType<QSet<QOpaqueExpression *>>("QSet<QtMof::QOpaqueExpression *>"); - qRegisterMetaType<QOperation *>("QtMof::QOperation *"); - qRegisterMetaType<QList<QOperation *>>("QList<QtMof::QOperation *>"); - qRegisterMetaType<QSet<QOperation *>>("QSet<QtMof::QOperation *>"); - qRegisterMetaType<QPackage *>("QtMof::QPackage *"); - qRegisterMetaType<QList<QPackage *>>("QList<QtMof::QPackage *>"); - qRegisterMetaType<QSet<QPackage *>>("QSet<QtMof::QPackage *>"); - qRegisterMetaType<QPackageableElement *>("QtMof::QPackageableElement *"); - qRegisterMetaType<QList<QPackageableElement *>>("QList<QtMof::QPackageableElement *>"); - qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QtMof::QPackageableElement *>"); - qRegisterMetaType<QPackageImport *>("QtMof::QPackageImport *"); - qRegisterMetaType<QList<QPackageImport *>>("QList<QtMof::QPackageImport *>"); - qRegisterMetaType<QSet<QPackageImport *>>("QSet<QtMof::QPackageImport *>"); - qRegisterMetaType<QPackageMerge *>("QtMof::QPackageMerge *"); - qRegisterMetaType<QList<QPackageMerge *>>("QList<QtMof::QPackageMerge *>"); - qRegisterMetaType<QSet<QPackageMerge *>>("QSet<QtMof::QPackageMerge *>"); - qRegisterMetaType<QParameter *>("QtMof::QParameter *"); - qRegisterMetaType<QList<QParameter *>>("QList<QtMof::QParameter *>"); - qRegisterMetaType<QSet<QParameter *>>("QSet<QtMof::QParameter *>"); - qRegisterMetaType<QPrimitiveType *>("QtMof::QPrimitiveType *"); - qRegisterMetaType<QList<QPrimitiveType *>>("QList<QtMof::QPrimitiveType *>"); - qRegisterMetaType<QSet<QPrimitiveType *>>("QSet<QtMof::QPrimitiveType *>"); - qRegisterMetaType<QProperty *>("QtMof::QProperty *"); - qRegisterMetaType<QList<QProperty *>>("QList<QtMof::QProperty *>"); - qRegisterMetaType<QSet<QProperty *>>("QSet<QtMof::QProperty *>"); - qRegisterMetaType<QRedefinableElement *>("QtMof::QRedefinableElement *"); - qRegisterMetaType<QList<QRedefinableElement *>>("QList<QtMof::QRedefinableElement *>"); - qRegisterMetaType<QSet<QRedefinableElement *>>("QSet<QtMof::QRedefinableElement *>"); - qRegisterMetaType<QReflectiveCollection *>("QtMof::QReflectiveCollection *"); - qRegisterMetaType<QList<QReflectiveCollection *>>("QList<QtMof::QReflectiveCollection *>"); - qRegisterMetaType<QSet<QReflectiveCollection *>>("QSet<QtMof::QReflectiveCollection *>"); - qRegisterMetaType<QReflectiveSequence *>("QtMof::QReflectiveSequence *"); - qRegisterMetaType<QList<QReflectiveSequence *>>("QList<QtMof::QReflectiveSequence *>"); - qRegisterMetaType<QSet<QReflectiveSequence *>>("QSet<QtMof::QReflectiveSequence *>"); - qRegisterMetaType<QRelationship *>("QtMof::QRelationship *"); - qRegisterMetaType<QList<QRelationship *>>("QList<QtMof::QRelationship *>"); - qRegisterMetaType<QSet<QRelationship *>>("QSet<QtMof::QRelationship *>"); - qRegisterMetaType<QSlot *>("QtMof::QSlot *"); - qRegisterMetaType<QList<QSlot *>>("QList<QtMof::QSlot *>"); - qRegisterMetaType<QSet<QSlot *>>("QSet<QtMof::QSlot *>"); - qRegisterMetaType<QStructuralFeature *>("QtMof::QStructuralFeature *"); - qRegisterMetaType<QList<QStructuralFeature *>>("QList<QtMof::QStructuralFeature *>"); - qRegisterMetaType<QSet<QStructuralFeature *>>("QSet<QtMof::QStructuralFeature *>"); - qRegisterMetaType<QTag *>("QtMof::QTag *"); - qRegisterMetaType<QList<QTag *>>("QList<QtMof::QTag *>"); - qRegisterMetaType<QSet<QTag *>>("QSet<QtMof::QTag *>"); - qRegisterMetaType<QType *>("QtMof::QType *"); - qRegisterMetaType<QList<QType *>>("QList<QtMof::QType *>"); - qRegisterMetaType<QSet<QType *>>("QSet<QtMof::QType *>"); - qRegisterMetaType<QTypedElement *>("QtMof::QTypedElement *"); - qRegisterMetaType<QList<QTypedElement *>>("QList<QtMof::QTypedElement *>"); - qRegisterMetaType<QSet<QTypedElement *>>("QSet<QtMof::QTypedElement *>"); - qRegisterMetaType<QURIExtent *>("QtMof::QURIExtent *"); - qRegisterMetaType<QList<QURIExtent *>>("QList<QtMof::QURIExtent *>"); - qRegisterMetaType<QSet<QURIExtent *>>("QSet<QtMof::QURIExtent *>"); - qRegisterMetaType<QValueSpecification *>("QtMof::QValueSpecification *"); - qRegisterMetaType<QList<QValueSpecification *>>("QList<QtMof::QValueSpecification *>"); - qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QtMof::QValueSpecification *>"); + qRegisterMetaType<QArgument *>(); + qRegisterMetaType<QList<QArgument *>>(); + qRegisterMetaType<QSet<QArgument *>>(); + qRegisterMetaType<QAssociation *>(); + qRegisterMetaType<QList<QAssociation *>>(); + qRegisterMetaType<QSet<QAssociation *>>(); + qRegisterMetaType<QBehavioralFeature *>(); + qRegisterMetaType<QList<QBehavioralFeature *>>(); + qRegisterMetaType<QSet<QBehavioralFeature *>>(); + qRegisterMetaType<QClass *>(); + qRegisterMetaType<QList<QClass *>>(); + qRegisterMetaType<QSet<QClass *>>(); + qRegisterMetaType<QClassifier *>(); + qRegisterMetaType<QList<QClassifier *>>(); + qRegisterMetaType<QSet<QClassifier *>>(); + qRegisterMetaType<QComment *>(); + qRegisterMetaType<QList<QComment *>>(); + qRegisterMetaType<QSet<QComment *>>(); + qRegisterMetaType<QConstraint *>(); + qRegisterMetaType<QList<QConstraint *>>(); + qRegisterMetaType<QSet<QConstraint *>>(); + qRegisterMetaType<QDataType *>(); + qRegisterMetaType<QList<QDataType *>>(); + qRegisterMetaType<QSet<QDataType *>>(); + qRegisterMetaType<QDirectedRelationship *>(); + qRegisterMetaType<QList<QDirectedRelationship *>>(); + qRegisterMetaType<QSet<QDirectedRelationship *>>(); + qRegisterMetaType<QElement *>(); + qRegisterMetaType<QList<QElement *>>(); + qRegisterMetaType<QSet<QElement *>>(); + qRegisterMetaType<QElementImport *>(); + qRegisterMetaType<QList<QElementImport *>>(); + qRegisterMetaType<QSet<QElementImport *>>(); + qRegisterMetaType<QEnumeration *>(); + qRegisterMetaType<QList<QEnumeration *>>(); + qRegisterMetaType<QSet<QEnumeration *>>(); + qRegisterMetaType<QEnumerationLiteral *>(); + qRegisterMetaType<QList<QEnumerationLiteral *>>(); + qRegisterMetaType<QSet<QEnumerationLiteral *>>(); + qRegisterMetaType<QException *>(); + qRegisterMetaType<QList<QException *>>(); + qRegisterMetaType<QSet<QException *>>(); + qRegisterMetaType<QExpression *>(); + qRegisterMetaType<QList<QExpression *>>(); + qRegisterMetaType<QSet<QExpression *>>(); + qRegisterMetaType<QExtent *>(); + qRegisterMetaType<QList<QExtent *>>(); + qRegisterMetaType<QSet<QExtent *>>(); + qRegisterMetaType<QFactory *>(); + qRegisterMetaType<QList<QFactory *>>(); + qRegisterMetaType<QSet<QFactory *>>(); + qRegisterMetaType<QFeature *>(); + qRegisterMetaType<QList<QFeature *>>(); + qRegisterMetaType<QSet<QFeature *>>(); + qRegisterMetaType<QGeneralization *>(); + qRegisterMetaType<QList<QGeneralization *>>(); + qRegisterMetaType<QSet<QGeneralization *>>(); + qRegisterMetaType<QInstanceSpecification *>(); + qRegisterMetaType<QList<QInstanceSpecification *>>(); + qRegisterMetaType<QSet<QInstanceSpecification *>>(); + qRegisterMetaType<QInstanceValue *>(); + qRegisterMetaType<QList<QInstanceValue *>>(); + qRegisterMetaType<QSet<QInstanceValue *>>(); + qRegisterMetaType<QLink *>(); + qRegisterMetaType<QList<QLink *>>(); + qRegisterMetaType<QSet<QLink *>>(); + qRegisterMetaType<QLiteralBoolean *>(); + qRegisterMetaType<QList<QLiteralBoolean *>>(); + qRegisterMetaType<QSet<QLiteralBoolean *>>(); + qRegisterMetaType<QLiteralInteger *>(); + qRegisterMetaType<QList<QLiteralInteger *>>(); + qRegisterMetaType<QSet<QLiteralInteger *>>(); + qRegisterMetaType<QLiteralNull *>(); + qRegisterMetaType<QList<QLiteralNull *>>(); + qRegisterMetaType<QSet<QLiteralNull *>>(); + qRegisterMetaType<QLiteralReal *>(); + qRegisterMetaType<QList<QLiteralReal *>>(); + qRegisterMetaType<QSet<QLiteralReal *>>(); + qRegisterMetaType<QLiteralSpecification *>(); + qRegisterMetaType<QList<QLiteralSpecification *>>(); + qRegisterMetaType<QSet<QLiteralSpecification *>>(); + qRegisterMetaType<QLiteralString *>(); + qRegisterMetaType<QList<QLiteralString *>>(); + qRegisterMetaType<QSet<QLiteralString *>>(); + qRegisterMetaType<QLiteralUnlimitedNatural *>(); + qRegisterMetaType<QList<QLiteralUnlimitedNatural *>>(); + qRegisterMetaType<QSet<QLiteralUnlimitedNatural *>>(); + qRegisterMetaType<QMofObject *>(); + qRegisterMetaType<QList<QMofObject *>>(); + qRegisterMetaType<QSet<QMofObject *>>(); + qRegisterMetaType<QMultiplicityElement *>(); + qRegisterMetaType<QList<QMultiplicityElement *>>(); + qRegisterMetaType<QSet<QMultiplicityElement *>>(); + qRegisterMetaType<QNamedElement *>(); + qRegisterMetaType<QList<QNamedElement *>>(); + qRegisterMetaType<QSet<QNamedElement *>>(); + qRegisterMetaType<QNamespace *>(); + qRegisterMetaType<QList<QNamespace *>>(); + qRegisterMetaType<QSet<QNamespace *>>(); + qRegisterMetaType<QOpaqueExpression *>(); + qRegisterMetaType<QList<QOpaqueExpression *>>(); + qRegisterMetaType<QSet<QOpaqueExpression *>>(); + qRegisterMetaType<QOperation *>(); + qRegisterMetaType<QList<QOperation *>>(); + qRegisterMetaType<QSet<QOperation *>>(); + qRegisterMetaType<QPackage *>(); + qRegisterMetaType<QList<QPackage *>>(); + qRegisterMetaType<QSet<QPackage *>>(); + qRegisterMetaType<QPackageableElement *>(); + qRegisterMetaType<QList<QPackageableElement *>>(); + qRegisterMetaType<QSet<QPackageableElement *>>(); + qRegisterMetaType<QPackageImport *>(); + qRegisterMetaType<QList<QPackageImport *>>(); + qRegisterMetaType<QSet<QPackageImport *>>(); + qRegisterMetaType<QPackageMerge *>(); + qRegisterMetaType<QList<QPackageMerge *>>(); + qRegisterMetaType<QSet<QPackageMerge *>>(); + qRegisterMetaType<QParameter *>(); + qRegisterMetaType<QList<QParameter *>>(); + qRegisterMetaType<QSet<QParameter *>>(); + qRegisterMetaType<QPrimitiveType *>(); + qRegisterMetaType<QList<QPrimitiveType *>>(); + qRegisterMetaType<QSet<QPrimitiveType *>>(); + qRegisterMetaType<QProperty *>(); + qRegisterMetaType<QList<QProperty *>>(); + qRegisterMetaType<QSet<QProperty *>>(); + qRegisterMetaType<QRedefinableElement *>(); + qRegisterMetaType<QList<QRedefinableElement *>>(); + qRegisterMetaType<QSet<QRedefinableElement *>>(); + qRegisterMetaType<QReflectiveCollection *>(); + qRegisterMetaType<QList<QReflectiveCollection *>>(); + qRegisterMetaType<QSet<QReflectiveCollection *>>(); + qRegisterMetaType<QReflectiveSequence *>(); + qRegisterMetaType<QList<QReflectiveSequence *>>(); + qRegisterMetaType<QSet<QReflectiveSequence *>>(); + qRegisterMetaType<QRelationship *>(); + qRegisterMetaType<QList<QRelationship *>>(); + qRegisterMetaType<QSet<QRelationship *>>(); + qRegisterMetaType<QSlot *>(); + qRegisterMetaType<QList<QSlot *>>(); + qRegisterMetaType<QSet<QSlot *>>(); + qRegisterMetaType<QStructuralFeature *>(); + qRegisterMetaType<QList<QStructuralFeature *>>(); + qRegisterMetaType<QSet<QStructuralFeature *>>(); + qRegisterMetaType<QTag *>(); + qRegisterMetaType<QList<QTag *>>(); + qRegisterMetaType<QSet<QTag *>>(); + qRegisterMetaType<QType *>(); + qRegisterMetaType<QList<QType *>>(); + qRegisterMetaType<QSet<QType *>>(); + qRegisterMetaType<QTypedElement *>(); + qRegisterMetaType<QList<QTypedElement *>>(); + qRegisterMetaType<QSet<QTypedElement *>>(); + qRegisterMetaType<QURIExtent *>(); + qRegisterMetaType<QList<QURIExtent *>>(); + qRegisterMetaType<QSet<QURIExtent *>>(); + qRegisterMetaType<QValueSpecification *>(); + qRegisterMetaType<QList<QValueSpecification *>>(); + qRegisterMetaType<QSet<QValueSpecification *>>(); if (scriptEngine) { qScriptRegisterMetaType(scriptEngine, qSetToScriptValue<QArgument>, scriptValueToQSet<QArgument>); @@ -318,5 +318,7 @@ void QMofMetaModel::init(QScriptEngine *scriptEngine) } } -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE diff --git a/src/mof/qmofmetamodel.h b/src/mof/qmofmetamodel.h index cfdb4802..671530d0 100644 --- a/src/mof/qmofmetamodel.h +++ b/src/mof/qmofmetamodel.h @@ -45,7 +45,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -55,7 +58,9 @@ public: static void init(QScriptEngine *scriptEngine = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qmofobject.cpp b/src/mof/qmofobject.cpp index b70de5e5..d366c343 100644 --- a/src/mof/qmofobject.cpp +++ b/src/mof/qmofobject.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QMofObjectPrivate::QMofObjectPrivate() { @@ -126,7 +129,9 @@ void QMofObject::setPropertyData() QWrappedObject::setPropertyData(); } -#include "moc_qmofobject.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qmofobject.cpp" diff --git a/src/mof/qmofobject.h b/src/mof/qmofobject.h index 0ba00d12..49d56e98 100644 --- a/src/mof/qmofobject.h +++ b/src/mof/qmofobject.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -87,7 +90,9 @@ protected: explicit QMofObject(QMofObjectPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qmofobject_p.h b/src/mof/qmofobject_p.h index d9caa812..d4e5e08b 100644 --- a/src/mof/qmofobject_p.h +++ b/src/mof/qmofobject_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -71,7 +74,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qmultiplicityelement.cpp b/src/mof/qmultiplicityelement.cpp index 56fb4b63..82999b16 100644 --- a/src/mof/qmultiplicityelement.cpp +++ b/src/mof/qmultiplicityelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QMultiplicityElementPrivate::QMultiplicityElementPrivate() : isUnique(true), @@ -317,52 +320,54 @@ qint32 QMultiplicityElement::upperBound() const void QMultiplicityElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the upper bound of the multiplicity interval."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attributes specifies whether the values in an instantiation of this element are unique."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attribute specifies whether the values in an instantiation of this element are sequentially ordered."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the lower bound of the multiplicity interval."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the upper bound for this multiplicity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the lower bound for this multiplicity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the upper bound of the multiplicity interval."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attributes specifies whether the values in an instantiation of this element are unique."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attribute specifies whether the values in an instantiation of this element are sequentially ordered."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the lower bound of the multiplicity interval."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the upper bound for this multiplicity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the lower bound for this multiplicity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qmultiplicityelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qmultiplicityelement.cpp" diff --git a/src/mof/qmultiplicityelement.h b/src/mof/qmultiplicityelement.h index 75d8a446..c98a1828 100644 --- a/src/mof/qmultiplicityelement.h +++ b/src/mof/qmultiplicityelement.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,8 +68,8 @@ class Q_MOF_EXPORT QMultiplicityElement : public QElement Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtMof::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtMof::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_DISABLE_COPY(QMultiplicityElement) Q_DECLARE_PRIVATE(QMultiplicityElement) @@ -107,7 +110,9 @@ protected: explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qmultiplicityelement_p.h b/src/mof/qmultiplicityelement_p.h index 75e15d2e..c1dd2f17 100644 --- a/src/mof/qmultiplicityelement_p.h +++ b/src/mof/qmultiplicityelement_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -70,7 +73,9 @@ public: QValueSpecification *lowerValue; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qnamedelement.cpp b/src/mof/qnamedelement.cpp index c434b776..e144761d 100644 --- a/src/mof/qnamedelement.cpp +++ b/src/mof/qnamedelement.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QNamedElementPrivate::QNamedElementPrivate() : namespace_(0) @@ -136,7 +139,7 @@ void QNamedElement::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtMof::VisibilityKind QNamedElement::visibility() const +QtMofNS::VisibilityKind QNamedElement::visibility() const { // This is a read-write attribute @@ -144,7 +147,7 @@ QtMof::VisibilityKind QNamedElement::visibility() const return d->visibility; } -void QNamedElement::setVisibility(QtMof::VisibilityKind visibility) +void QNamedElement::setVisibility(QtMofNS::VisibilityKind visibility) { // This is a read-write attribute @@ -231,38 +234,40 @@ QString QNamedElement::separator() const void QNamedElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The name of the NamedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A name which allows the NamedElement to be identified within a hierarchy of nested Namespaces. It is constructed from the names of the containing namespaces starting at the root of the hierarchy and ending with the name of the NamedElement itself."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedMember"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The name of the NamedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A name which allows the NamedElement to be identified within a hierarchy of nested Namespaces. It is constructed from the names of the containing namespaces starting at the root of the hierarchy and ending with the name of the NamedElement itself."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedMember"); QElement::setPropertyData(); } -#include "moc_qnamedelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qnamedelement.cpp" diff --git a/src/mof/qnamedelement.h b/src/mof/qnamedelement.h index 2cb557c9..a66337a3 100644 --- a/src/mof/qnamedelement.h +++ b/src/mof/qnamedelement.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -69,9 +72,9 @@ class Q_MOF_EXPORT QNamedElement : public QElement Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) Q_DISABLE_COPY(QNamedElement) Q_DECLARE_PRIVATE(QNamedElement) @@ -83,8 +86,8 @@ public: // Attributes from QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from QNamedElement @@ -104,7 +107,9 @@ protected: explicit QNamedElement(QNamedElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qnamedelement_p.h b/src/mof/qnamedelement_p.h index 56644501..ef3b13f8 100644 --- a/src/mof/qnamedelement_p.h +++ b/src/mof/qnamedelement_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -72,14 +75,16 @@ public: virtual ~QNamedElementPrivate(); QString name; - QtMof::VisibilityKind visibility; + QtMofNS::VisibilityKind visibility; QNamespace *namespace_; // Internal functions for read-only subsetted association ends void setNamespace_(QNamespace *namespace_); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qnamespace.cpp b/src/mof/qnamespace.cpp index 7a0aabee..7bd22be6 100644 --- a/src/mof/qnamespace.cpp +++ b/src/mof/qnamespace.cpp @@ -52,7 +52,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QNamespacePrivate::QNamespacePrivate() { @@ -375,52 +378,54 @@ bool QNamespace::membersAreDistinguishable() const void QNamespace::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageImports owned by the Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageImport::importingNamespace"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ElementImports owned by the Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElementImport::importingNamespace"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a set of Constraints owned by this Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConstraint::context"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements owned by the Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageImports owned by the Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageImport::importingNamespace"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ElementImports owned by the Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElementImport::importingNamespace"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a set of Constraints owned by this Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConstraint::context"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements owned by the Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamedElement::namespace"); QNamedElement::setPropertyData(); } -#include "moc_qnamespace.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qnamespace.cpp" diff --git a/src/mof/qnamespace.h b/src/mof/qnamespace.h index 779aa76f..8b885303 100644 --- a/src/mof/qnamespace.h +++ b/src/mof/qnamespace.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -68,12 +71,12 @@ class Q_MOF_EXPORT QNamespace : public QNamedElement { Q_OBJECT - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtMof::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtMof::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtMof::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtMof::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtMof::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtMof::QNamedElement *> ownedMembers READ ownedMembers) Q_DISABLE_COPY(QNamespace) Q_DECLARE_PRIVATE(QNamespace) @@ -111,7 +114,9 @@ protected: explicit QNamespace(QNamespacePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qnamespace_p.h b/src/mof/qnamespace_p.h index b9266712..ef01a916 100644 --- a/src/mof/qnamespace_p.h +++ b/src/mof/qnamespace_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -83,7 +86,9 @@ public: void removeOwnedMember(QNamedElement *ownedMember); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qopaqueexpression.cpp b/src/mof/qopaqueexpression.cpp index 861ce269..20a1b6a6 100644 --- a/src/mof/qopaqueexpression.cpp +++ b/src/mof/qopaqueexpression.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QOpaqueExpressionPrivate::QOpaqueExpressionPrivate() { @@ -186,24 +189,26 @@ qint32 QOpaqueExpression::value() const void QOpaqueExpression::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The text of the expression, possibly in multiple languages."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The text of the expression, possibly in multiple languages."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qopaqueexpression.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qopaqueexpression.cpp" diff --git a/src/mof/qopaqueexpression.h b/src/mof/qopaqueexpression.h index aa8b6000..81f6eaba 100644 --- a/src/mof/qopaqueexpression.h +++ b/src/mof/qopaqueexpression.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -92,7 +95,9 @@ protected: explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qopaqueexpression_p.h b/src/mof/qopaqueexpression_p.h index 320be715..8f910cbf 100644 --- a/src/mof/qopaqueexpression_p.h +++ b/src/mof/qopaqueexpression_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QOpaqueExpression; @@ -69,7 +72,9 @@ public: QList<QString> languages; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qoperation.cpp b/src/mof/qoperation.cpp index 71cebdba..fd7d42fe 100644 --- a/src/mof/qoperation.cpp +++ b/src/mof/qoperation.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QOperationPrivate::QOperationPrivate() : isQuery(false), @@ -515,108 +518,110 @@ QSet<QParameter *> QOperation::returnResult() const void QOperation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the lower multiplicity of the return parameter, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether an execution of the BehavioralFeature leaves the state of the system unchanged (isQuery=true) or whether side effects may occur (isQuery=false)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the return parameter is unique or not, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the upper multiplicity of the return parameter, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the return parameter is ordered or not, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the parameters owned by this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::ownedParameters"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameter::operation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional Constraint on the result values of an invocation of this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operations that are redefined by this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying the state of the system when the Operation is completed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedOperation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the return result of the operation, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints on the state of the system when the Operation is invoked."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The class that owns the operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedOperation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::raisedExceptions"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the lower multiplicity of the return parameter, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether an execution of the BehavioralFeature leaves the state of the system unchanged (isQuery=true) or whether side effects may occur (isQuery=false)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the return parameter is unique or not, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the upper multiplicity of the return parameter, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the return parameter is ordered or not, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the parameters owned by this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::ownedParameters"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameter::operation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional Constraint on the result values of an invocation of this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operations that are redefined by this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying the state of the system when the Operation is completed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedOperation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the return result of the operation, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints on the state of the system when the Operation is invoked."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The class that owns the operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedOperation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::raisedExceptions"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QBehavioralFeature::setPropertyData(); } -#include "moc_qoperation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qoperation.cpp" diff --git a/src/mof/qoperation.h b/src/mof/qoperation.h index f54ea915..c6ee9c2a 100644 --- a/src/mof/qoperation.h +++ b/src/mof/qoperation.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -75,15 +78,15 @@ class Q_MOF_EXPORT QOperation : public QBehavioralFeature Q_PROPERTY(bool isUnique READ isUnique STORED false) Q_PROPERTY(qint32 upper READ upper STORED false) Q_PROPERTY(bool isOrdered READ isOrdered STORED false) - Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) - Q_PROPERTY(QConstraint * bodyCondition READ bodyCondition WRITE setBodyCondition) - Q_PROPERTY(QSet<QOperation *> redefinedOperations READ redefinedOperations) - Q_PROPERTY(QSet<QConstraint *> postconditions READ postconditions) - Q_PROPERTY(QDataType * datatype READ datatype WRITE setDatatype) - Q_PROPERTY(QType * type READ type STORED false) - Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) - Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) - Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) + Q_PROPERTY(QList<QtMof::QParameter *> ownedParameters READ ownedParameters) + Q_PROPERTY(QtMof::QConstraint * bodyCondition READ bodyCondition WRITE setBodyCondition) + Q_PROPERTY(QSet<QtMof::QOperation *> redefinedOperations READ redefinedOperations) + Q_PROPERTY(QSet<QtMof::QConstraint *> postconditions READ postconditions) + Q_PROPERTY(QtMof::QDataType * datatype READ datatype WRITE setDatatype) + Q_PROPERTY(QtMof::QType * type READ type STORED false) + Q_PROPERTY(QSet<QtMof::QConstraint *> preconditions READ preconditions) + Q_PROPERTY(QtMof::QClass * class_ READ class_ WRITE setClass_) + Q_PROPERTY(QSet<QtMof::QType *> raisedExceptions READ raisedExceptions) Q_DISABLE_COPY(QOperation) Q_DECLARE_PRIVATE(QOperation) @@ -135,7 +138,9 @@ protected: explicit QOperation(QOperationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qoperation_p.h b/src/mof/qoperation_p.h index ebd3cafd..4f986a12 100644 --- a/src/mof/qoperation_p.h +++ b/src/mof/qoperation_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -84,7 +87,9 @@ public: QSet<QType *> raisedExceptions; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackage.cpp b/src/mof/qpackage.cpp index e2062b75..503ae034 100644 --- a/src/mof/qpackage.cpp +++ b/src/mof/qpackage.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QPackagePrivate::QPackagePrivate() : nestingPackage(0) @@ -251,19 +254,19 @@ QSet<QNamedElement *> QPackage::ownedMembers() const /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtMof::VisibilityKind QPackage::visibility() const +QtMofNS::VisibilityKind QPackage::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QPackage::setVisibility(QtMof::VisibilityKind visibility) +void QPackage::setVisibility(QtMofNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QPackage::unsetVisibility() { - setVisibility(QtMof::VisibilityPublic); + setVisibility(QtMofNS::VisibilityPublic); Q_D(QPackage); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -304,20 +307,21 @@ QSet<QType *> QPackage::ownedTypes() const { // This is a read-write derived association end - Q_D(const QPackage); - QSet<QType *> ownedTypes_; - foreach (QPackageableElement *packageableElement, d->packagedElements) - if (QType *type = qwrappedobject_cast<QType *>(packageableElement)) - ownedTypes_.insert(type); - return ownedTypes_; + qWarning("QPackage::ownedTypes: to be implemented (this is a derived associationend)"); + + return QSet<QType *>(); // change here to your derived return } void QPackage::addOwnedType(QType *ownedType) { // This is a read-write derived association end - Q_D(QPackage); - if (!d->packagedElements.contains(ownedType)) { + qWarning("QPackage::addOwnedType: to be implemented (this is a derived associationend)"); + Q_UNUSED(ownedType); + + if (false) { // change to your derived inclusion criteria + // change to your derived code + // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); @@ -330,8 +334,12 @@ void QPackage::removeOwnedType(QType *ownedType) { // This is a read-write derived association end - Q_D(QPackage); - if (d->packagedElements.contains(ownedType)) { + qWarning("QPackage::removeOwnedType: to be implemented (this is a derived associationend)"); + Q_UNUSED(ownedType); + + if (false) { // change to your derived exclusion criteria + // change to your derived code + // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(ownedType)); @@ -459,20 +467,21 @@ QSet<QPackage *> QPackage::nestedPackages() const { // This is a read-write derived association end - Q_D(const QPackage); - QSet<QPackage *> nestedPackages_; - foreach (QPackageableElement *packageableElement, d->packagedElements) - if (QPackage *package = qwrappedobject_cast<QPackage *>(packageableElement)) - nestedPackages_.insert(package); - return nestedPackages_; + qWarning("QPackage::nestedPackages: to be implemented (this is a derived associationend)"); + + return QSet<QPackage *>(); // change here to your derived return } void QPackage::addNestedPackage(QPackage *nestedPackage) { // This is a read-write derived association end - Q_D(QPackage); - if (!d->packagedElements.contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { + qWarning("QPackage::addNestedPackage: to be implemented (this is a derived associationend)"); + Q_UNUSED(nestedPackage); + + if (false) { // change to your derived inclusion criteria + // change to your derived code + // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->addPackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); @@ -485,8 +494,12 @@ void QPackage::removeNestedPackage(QPackage *nestedPackage) { // This is a read-write derived association end - Q_D(QPackage); - if (d->packagedElements.contains(qwrappedobject_cast<QPackageableElement *>(nestedPackage))) { + qWarning("QPackage::removeNestedPackage: to be implemented (this is a derived associationend)"); + Q_UNUSED(nestedPackage); + + if (false) { // change to your derived exclusion criteria + // change to your derived code + // Adjust subsetted property(ies) (qwrappedobject_cast<QPackage *>(this))->removePackagedElement(qwrappedobject_cast<QPackageableElement *>(nestedPackage)); @@ -528,47 +541,47 @@ QSet<QPackageableElement *> QPackage::visibleMembers() const void QPackage::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides an identifier for the package that can be used for many purposes. A URI is the universally unique identification of the package following the IETF URI specification, RFC 2396 http://www.ietf.org/rfc/rfc2396.txt and it must comply with those syntax rules."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Types."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QType::package"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the packageable elements that are owned by this Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that owns this Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestedPackage"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageMerges that are owned by this Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageMerge::receivingPackage"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Packages."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestingPackage"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides an identifier for the package that can be used for many purposes. A URI is the universally unique identification of the package following the IETF URI specification, RFC 2396 http://www.ietf.org/rfc/rfc2396.txt and it must comply with those syntax rules."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Types."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QType::package"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the packageable elements that are owned by this Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that owns this Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestedPackage"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageMerges that are owned by this Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageMerge::receivingPackage"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Packages."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestingPackage"); QWrappedObject::setPropertyData(); } @@ -595,7 +608,9 @@ void QPackage::removePackagedElement(QWrappedObjectPointer<QPackage> nestedPacka removeNestedPackage(nestedPackage); } -#include "moc_qpackage.cpp" +} -QT_END_NAMESPACE_QTMOF +QT_END_NAMESPACE + +#include "moc_qpackage.cpp" diff --git a/src/mof/qpackage.h b/src/mof/qpackage.h index 1a7bd978..8951ee5c 100644 --- a/src/mof/qpackage.h +++ b/src/mof/qpackage.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -71,29 +74,29 @@ class Q_MOF_EXPORT QPackage : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtMof::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtMof::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtMof::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtMof::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtMof::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtMof::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) Q_PROPERTY(QString URI READ URI WRITE setURI) - Q_PROPERTY(QSet<QType *> ownedTypes READ ownedTypes STORED false) - Q_PROPERTY(QSet<QPackageableElement *> packagedElements READ packagedElements) - Q_PROPERTY(QPackage * nestingPackage READ nestingPackage WRITE setNestingPackage) - Q_PROPERTY(QSet<QPackageMerge *> packageMerges READ packageMerges) - Q_PROPERTY(QSet<QPackage *> nestedPackages READ nestedPackages STORED false) + Q_PROPERTY(QSet<QtMof::QType *> ownedTypes READ ownedTypes STORED false) + Q_PROPERTY(QSet<QtMof::QPackageableElement *> packagedElements READ packagedElements) + Q_PROPERTY(QtMof::QPackage * nestingPackage READ nestingPackage WRITE setNestingPackage) + Q_PROPERTY(QSet<QtMof::QPackageMerge *> packageMerges READ packageMerges) + Q_PROPERTY(QSet<QtMof::QPackage *> nestedPackages READ nestedPackages STORED false) Q_DISABLE_COPY(QPackage) Q_DECLARE_PRIVATE(QPackage) @@ -132,8 +135,8 @@ public: Q_INVOKABLE QSet<QNamedElement *> ownedMembers() const; // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Attributes from QPackage @@ -177,7 +180,9 @@ private: QPackageableElement *_wrappedPackageableElement; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackage_p.h b/src/mof/qpackage_p.h index 4bdb6644..dc718ee9 100644 --- a/src/mof/qpackage_p.h +++ b/src/mof/qpackage_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -78,7 +81,9 @@ public: QSet<QPackageMerge *> packageMerges; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackageableelement.cpp b/src/mof/qpackageableelement.cpp index 2d3e16b8..ed56bab7 100644 --- a/src/mof/qpackageableelement.cpp +++ b/src/mof/qpackageableelement.cpp @@ -44,10 +44,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QPackageableElementPrivate::QPackageableElementPrivate() : - visibility(QtMof::VisibilityPublic) + visibility(QtMofNS::VisibilityPublic) { } @@ -86,7 +89,7 @@ QPackageableElement::~QPackageableElement() /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtMof::VisibilityKind QPackageableElement::visibility() const +QtMofNS::VisibilityKind QPackageableElement::visibility() const { // This is a read-write attribute @@ -94,7 +97,7 @@ QtMof::VisibilityKind QPackageableElement::visibility() const return d->visibility; } -void QPackageableElement::setVisibility(QtMof::VisibilityKind visibility) +void QPackageableElement::setVisibility(QtMofNS::VisibilityKind visibility) { // This is a read-write attribute @@ -110,24 +113,26 @@ void QPackageableElement::setVisibility(QtMof::VisibilityKind visibility) void QPackageableElement::unsetVisibility() { - setVisibility(QtMof::VisibilityPublic); + setVisibility(QtMofNS::VisibilityPublic); Q_D(QPackageableElement); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } void QPackageableElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates that packageable elements must always have a visibility, i.e., visibility is not optional."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QNamedElement::visibility"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates that packageable elements must always have a visibility, i.e., visibility is not optional."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QNamedElement::visibility"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qpackageableelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qpackageableelement.cpp" diff --git a/src/mof/qpackageableelement.h b/src/mof/qpackageableelement.h index 277a6bc2..19d75121 100644 --- a/src/mof/qpackageableelement.h +++ b/src/mof/qpackageableelement.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -61,7 +64,7 @@ class Q_MOF_EXPORT QPackageableElement : public QNamedElement { Q_OBJECT - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) Q_DISABLE_COPY(QPackageableElement) Q_DECLARE_PRIVATE(QPackageableElement) @@ -71,8 +74,8 @@ public: virtual ~QPackageableElement(); // Attributes from QPackageableElement - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); virtual void setPropertyData(); @@ -81,7 +84,9 @@ protected: explicit QPackageableElement(QPackageableElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackageableelement_p.h b/src/mof/qpackageableelement_p.h index 0f47c27b..86959002 100644 --- a/src/mof/qpackageableelement_p.h +++ b/src/mof/qpackageableelement_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -63,10 +66,12 @@ public: explicit QPackageableElementPrivate(); virtual ~QPackageableElementPrivate(); - QtMof::VisibilityKind visibility; + QtMofNS::VisibilityKind visibility; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackageimport.cpp b/src/mof/qpackageimport.cpp index 94b7800f..675855d3 100644 --- a/src/mof/qpackageimport.cpp +++ b/src/mof/qpackageimport.cpp @@ -47,10 +47,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QPackageImportPrivate::QPackageImportPrivate() : - visibility(QtMof::VisibilityPublic), + visibility(QtMofNS::VisibilityPublic), importingNamespace(0), importedPackage(0) { @@ -91,7 +94,7 @@ QPackageImport::~QPackageImport() /*! Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not. */ -QtMof::VisibilityKind QPackageImport::visibility() const +QtMofNS::VisibilityKind QPackageImport::visibility() const { // This is a read-write attribute @@ -99,7 +102,7 @@ QtMof::VisibilityKind QPackageImport::visibility() const return d->visibility; } -void QPackageImport::setVisibility(QtMof::VisibilityKind visibility) +void QPackageImport::setVisibility(QtMofNS::VisibilityKind visibility) { // This is a read-write attribute @@ -112,7 +115,7 @@ void QPackageImport::setVisibility(QtMof::VisibilityKind visibility) void QPackageImport::unsetVisibility() { - setVisibility(QtMof::VisibilityPublic); + setVisibility(QtMofNS::VisibilityPublic); Q_D(QPackageImport); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -190,31 +193,33 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage) void QPackageImport::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports the members from a Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::packageImport"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Package whose members are imported into a Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports the members from a Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::packageImport"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Package whose members are imported into a Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDirectedRelationship::setPropertyData(); } -#include "moc_qpackageimport.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qpackageimport.cpp" diff --git a/src/mof/qpackageimport.h b/src/mof/qpackageimport.h index 79089223..fde68fcd 100644 --- a/src/mof/qpackageimport.h +++ b/src/mof/qpackageimport.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,9 +68,9 @@ class Q_MOF_EXPORT QPackageImport : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) - Q_PROPERTY(QPackage * importedPackage READ importedPackage WRITE setImportedPackage) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtMof::QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) + Q_PROPERTY(QtMof::QPackage * importedPackage READ importedPackage WRITE setImportedPackage) Q_DISABLE_COPY(QPackageImport) Q_DECLARE_PRIVATE(QPackageImport) @@ -77,8 +80,8 @@ public: virtual ~QPackageImport(); // Attributes from QPackageImport - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from QPackageImport @@ -93,7 +96,9 @@ protected: explicit QPackageImport(QPackageImportPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackageimport_p.h b/src/mof/qpackageimport_p.h index 27b4ccc1..910f6f02 100644 --- a/src/mof/qpackageimport_p.h +++ b/src/mof/qpackageimport_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -68,12 +71,14 @@ public: explicit QPackageImportPrivate(); virtual ~QPackageImportPrivate(); - QtMof::VisibilityKind visibility; + QtMofNS::VisibilityKind visibility; QNamespace *importingNamespace; QPackage *importedPackage; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackagemerge.cpp b/src/mof/qpackagemerge.cpp index fd2b5073..a52aff78 100644 --- a/src/mof/qpackagemerge.cpp +++ b/src/mof/qpackagemerge.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QPackageMergePrivate::QPackageMergePrivate() : mergedPackage(0), @@ -155,24 +158,26 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage) void QPackageMerge::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is to be merged with the receiving package of the PackageMerge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is being extended with the contents of the merged package of the PackageMerge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::packageMerge"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is to be merged with the receiving package of the PackageMerge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is being extended with the contents of the merged package of the PackageMerge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::packageMerge"); QDirectedRelationship::setPropertyData(); } -#include "moc_qpackagemerge.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qpackagemerge.cpp" diff --git a/src/mof/qpackagemerge.h b/src/mof/qpackagemerge.h index 8eba62b0..e3d3cd60 100644 --- a/src/mof/qpackagemerge.h +++ b/src/mof/qpackagemerge.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -61,8 +64,8 @@ class Q_MOF_EXPORT QPackageMerge : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(QPackage * mergedPackage READ mergedPackage WRITE setMergedPackage) - Q_PROPERTY(QPackage * receivingPackage READ receivingPackage WRITE setReceivingPackage) + Q_PROPERTY(QtMof::QPackage * mergedPackage READ mergedPackage WRITE setMergedPackage) + Q_PROPERTY(QtMof::QPackage * receivingPackage READ receivingPackage WRITE setReceivingPackage) Q_DISABLE_COPY(QPackageMerge) Q_DECLARE_PRIVATE(QPackageMerge) @@ -83,7 +86,9 @@ protected: explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qpackagemerge_p.h b/src/mof/qpackagemerge_p.h index 23f4d4b6..75f6d58c 100644 --- a/src/mof/qpackagemerge_p.h +++ b/src/mof/qpackagemerge_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -68,7 +71,9 @@ public: QPackage *receivingPackage; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qparameter.cpp b/src/mof/qparameter.cpp index 762decd3..278c138a 100644 --- a/src/mof/qparameter.cpp +++ b/src/mof/qparameter.cpp @@ -47,10 +47,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QParameterPrivate::QParameterPrivate() : - direction(QtMof::ParameterDirectionIn), + direction(QtMofNS::ParameterDirectionIn), operation(0), defaultValue(0) { @@ -146,12 +149,12 @@ void QParameter::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtMof::VisibilityKind QParameter::visibility() const +QtMofNS::VisibilityKind QParameter::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QParameter::setVisibility(QtMof::VisibilityKind visibility) +void QParameter::setVisibility(QtMofNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -319,7 +322,7 @@ QString QParameter::default_() const /*! Indicates whether a parameter is being sent into or out of a behavioral element. */ -QtMof::ParameterDirectionKind QParameter::direction() const +QtMofNS::ParameterDirectionKind QParameter::direction() const { // This is a read-write attribute @@ -327,7 +330,7 @@ QtMof::ParameterDirectionKind QParameter::direction() const return d->direction; } -void QParameter::setDirection(QtMof::ParameterDirectionKind direction) +void QParameter::setDirection(QtMofNS::ParameterDirectionKind direction) { // This is a read-write attribute @@ -340,7 +343,7 @@ void QParameter::setDirection(QtMof::ParameterDirectionKind direction) void QParameter::unsetDirection() { - setDirection(QtMof::ParameterDirectionIn); + setDirection(QtMofNS::ParameterDirectionIn); Q_D(QParameter); d->modifiedResettableProperties.removeAll(QString::fromLatin1("direction")); } @@ -412,38 +415,40 @@ void QParameter::setDefaultValue(QValueSpecification *defaultValue) void QParameter::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a String that represents a value to be used when no argument is supplied for the Parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether a parameter is being sent into or out of a behavioral element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operation owning this parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::ownedParameter"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a ValueSpecification that represents a value to be used when no argument is supplied for the Parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a String that represents a value to be used when no argument is supplied for the Parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether a parameter is being sent into or out of a behavioral element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operation owning this parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::ownedParameter"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a ValueSpecification that represents a value to be used when no argument is supplied for the Parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qparameter.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qparameter.cpp" diff --git a/src/mof/qparameter.h b/src/mof/qparameter.h index 5dff6dbb..62d326d7 100644 --- a/src/mof/qparameter.h +++ b/src/mof/qparameter.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -70,28 +73,28 @@ class Q_MOF_EXPORT QParameter : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtMof::QType * type READ type WRITE setType) Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtMof::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtMof::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_PROPERTY(QString default_ READ default_ STORED false) - Q_PROPERTY(QtMof::ParameterDirectionKind direction READ direction WRITE setDirection RESET unsetDirection) - Q_PROPERTY(QOperation * operation READ operation WRITE setOperation) - Q_PROPERTY(QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) + Q_PROPERTY(QtMofNS::ParameterDirectionKind direction READ direction WRITE setDirection RESET unsetDirection) + Q_PROPERTY(QtMof::QOperation * operation READ operation WRITE setOperation) + Q_PROPERTY(QtMof::QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) Q_DISABLE_COPY(QParameter) Q_DECLARE_PRIVATE(QParameter) @@ -110,8 +113,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -142,8 +145,8 @@ public: // Attributes from QParameter Q_INVOKABLE QString default_() const; - Q_INVOKABLE QtMof::ParameterDirectionKind direction() const; - Q_INVOKABLE void setDirection(QtMof::ParameterDirectionKind direction); + Q_INVOKABLE QtMofNS::ParameterDirectionKind direction() const; + Q_INVOKABLE void setDirection(QtMofNS::ParameterDirectionKind direction); Q_INVOKABLE void unsetDirection(); // Association ends from QParameter @@ -162,7 +165,9 @@ private: QMultiplicityElement *_wrappedMultiplicityElement; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qparameter_p.h b/src/mof/qparameter_p.h index bcd2f232..469feea4 100644 --- a/src/mof/qparameter_p.h +++ b/src/mof/qparameter_p.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -73,12 +76,14 @@ public: explicit QParameterPrivate(); virtual ~QParameterPrivate(); - QtMof::ParameterDirectionKind direction; + QtMofNS::ParameterDirectionKind direction; QOperation *operation; QValueSpecification *defaultValue; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qprimitivetype.cpp b/src/mof/qprimitivetype.cpp index a55aab3a..c4b15fe8 100644 --- a/src/mof/qprimitivetype.cpp +++ b/src/mof/qprimitivetype.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QPrimitiveTypePrivate::QPrimitiveTypePrivate() { @@ -83,7 +86,9 @@ void QPrimitiveType::setPropertyData() QDataType::setPropertyData(); } -#include "moc_qprimitivetype.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qprimitivetype.cpp" diff --git a/src/mof/qprimitivetype.h b/src/mof/qprimitivetype.h index 402667d1..45043aa8 100644 --- a/src/mof/qprimitivetype.h +++ b/src/mof/qprimitivetype.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -71,7 +74,9 @@ protected: explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qprimitivetype_p.h b/src/mof/qprimitivetype_p.h index 715867df..8fab50cd 100644 --- a/src/mof/qprimitivetype_p.h +++ b/src/mof/qprimitivetype_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QPrimitiveType; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qproperty.cpp b/src/mof/qproperty.cpp index 7b92dc96..05566e83 100644 --- a/src/mof/qproperty.cpp +++ b/src/mof/qproperty.cpp @@ -51,14 +51,17 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QPropertyPrivate::QPropertyPrivate() : isDerived(false), isReadOnly(false), isID(false), isDerivedUnion(false), - aggregation(QtMof::AggregationNone), + aggregation(QtMofNS::AggregationNone), owningAssociation(0), defaultValue(0), class_(0), @@ -269,7 +272,7 @@ void QProperty::unsetDerivedUnion() /*! Specifies the kind of aggregation that applies to the Property. */ -QtMof::AggregationKind QProperty::aggregation() const +QtMofNS::AggregationKind QProperty::aggregation() const { // This is a read-write attribute @@ -277,7 +280,7 @@ QtMof::AggregationKind QProperty::aggregation() const return d->aggregation; } -void QProperty::setAggregation(QtMof::AggregationKind aggregation) +void QProperty::setAggregation(QtMofNS::AggregationKind aggregation) { // This is a read-write attribute @@ -290,7 +293,7 @@ void QProperty::setAggregation(QtMof::AggregationKind aggregation) void QProperty::unsetAggregation() { - setAggregation(QtMof::AggregationNone); + setAggregation(QtMofNS::AggregationNone); Q_D(QProperty); d->modifiedResettableProperties.removeAll(QString::fromLatin1("aggregation")); } @@ -620,115 +623,117 @@ QSet<QType *> QProperty::subsettingContext() const void QProperty::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the Property is derived, i.e., whether its value or values can be computed from other information."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A String that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This is a derived value, indicating whether the aggregation of the Property is composite or not."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the attribute may only be read, and not written."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuralFeature::isReadOnly"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("True indicates this property can be used to uniquely identify an instance of the containing Class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the property is derived as the union of all of the properties that are constrained to subset it."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the kind of aggregation that applies to the Property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties of which this property is constrained to be a subset."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the owning association of this property, if any."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QProperty::association QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::ownedEnd"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A ValueSpecification that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Class that owns the Property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedAttribute"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("In the case where the property is one navigable end of a binary association with both ends navigable, this gives the other end."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedAttribute"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties that are redefined by this property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the association of which this property is a member, if any."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::memberEnd"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the Property is derived, i.e., whether its value or values can be computed from other information."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A String that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This is a derived value, indicating whether the aggregation of the Property is composite or not."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the attribute may only be read, and not written."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuralFeature::isReadOnly"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("True indicates this property can be used to uniquely identify an instance of the containing Class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the property is derived as the union of all of the properties that are constrained to subset it."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the kind of aggregation that applies to the Property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties of which this property is constrained to be a subset."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the owning association of this property, if any."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QProperty::association QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::ownedEnd"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A ValueSpecification that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Class that owns the Property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedAttribute"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("In the case where the property is one navigable end of a binary association with both ends navigable, this gives the other end."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedAttribute"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties that are redefined by this property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the association of which this property is a member, if any."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::memberEnd"); QStructuralFeature::setPropertyData(); } -#include "moc_qproperty.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qproperty.cpp" diff --git a/src/mof/qproperty.h b/src/mof/qproperty.h index 4da7c41f..8c9acee4 100644 --- a/src/mof/qproperty.h +++ b/src/mof/qproperty.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -79,15 +82,15 @@ class Q_MOF_EXPORT QProperty : public QStructuralFeature Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID) Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion) - Q_PROPERTY(QtMof::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation) - Q_PROPERTY(QSet<QProperty *> subsettedProperties READ subsettedProperties) - Q_PROPERTY(QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) - Q_PROPERTY(QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) - Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) - Q_PROPERTY(QProperty * opposite READ opposite WRITE setOpposite STORED false) - Q_PROPERTY(QDataType * datatype READ datatype WRITE setDatatype) - Q_PROPERTY(QSet<QProperty *> redefinedProperties READ redefinedProperties) - Q_PROPERTY(QAssociation * association READ association WRITE setAssociation) + Q_PROPERTY(QtMofNS::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation) + Q_PROPERTY(QSet<QtMof::QProperty *> subsettedProperties READ subsettedProperties) + Q_PROPERTY(QtMof::QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) + Q_PROPERTY(QtMof::QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) + Q_PROPERTY(QtMof::QClass * class_ READ class_ WRITE setClass_) + Q_PROPERTY(QtMof::QProperty * opposite READ opposite WRITE setOpposite STORED false) + Q_PROPERTY(QtMof::QDataType * datatype READ datatype WRITE setDatatype) + Q_PROPERTY(QSet<QtMof::QProperty *> redefinedProperties READ redefinedProperties) + Q_PROPERTY(QtMof::QAssociation * association READ association WRITE setAssociation) Q_DISABLE_COPY(QProperty) Q_DECLARE_PRIVATE(QProperty) @@ -113,8 +116,8 @@ public: Q_INVOKABLE bool isDerivedUnion() const; Q_INVOKABLE void setDerivedUnion(bool isDerivedUnion); Q_INVOKABLE void unsetDerivedUnion(); - Q_INVOKABLE QtMof::AggregationKind aggregation() const; - Q_INVOKABLE void setAggregation(QtMof::AggregationKind aggregation); + Q_INVOKABLE QtMofNS::AggregationKind aggregation() const; + Q_INVOKABLE void setAggregation(QtMofNS::AggregationKind aggregation); Q_INVOKABLE void unsetAggregation(); // Association ends from QProperty @@ -149,7 +152,9 @@ protected: explicit QProperty(QPropertyPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qproperty_p.h b/src/mof/qproperty_p.h index bb7b9358..014d52b2 100644 --- a/src/mof/qproperty_p.h +++ b/src/mof/qproperty_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -80,7 +83,7 @@ public: bool isReadOnly; bool isID; bool isDerivedUnion; - QtMof::AggregationKind aggregation; + QtMofNS::AggregationKind aggregation; QSet<QProperty *> subsettedProperties; QAssociation *owningAssociation; QValueSpecification *defaultValue; @@ -90,7 +93,9 @@ public: QAssociation *association; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qredefinableelement.cpp b/src/mof/qredefinableelement.cpp index b27611a0..592f5c9d 100644 --- a/src/mof/qredefinableelement.cpp +++ b/src/mof/qredefinableelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QRedefinableElementPrivate::QRedefinableElementPrivate() : isLeaf(false) @@ -200,31 +203,33 @@ bool QRedefinableElement::isRedefinitionContextValid(const QRedefinableElement * void QRedefinableElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether it is possible to further redefine a RedefinableElement. If the value is true, then it is not possible to further redefine the RedefinableElement. Note that this property is preserved through package merge operations; that is, the capability to redefine a RedefinableElement (i.e., isLeaf=false) must be preserved in the resulting RedefinableElement of a package merge operation where a RedefinableElement with isLeaf=false is merged with a matching RedefinableElement with isLeaf=true: the resulting RedefinableElement will have isLeaf=false. Default value is false."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The redefinable element that is being redefined by this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the contexts that this element may be redefined from."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether it is possible to further redefine a RedefinableElement. If the value is true, then it is not possible to further redefine the RedefinableElement. Note that this property is preserved through package merge operations; that is, the capability to redefine a RedefinableElement (i.e., isLeaf=false) must be preserved in the resulting RedefinableElement of a package merge operation where a RedefinableElement with isLeaf=false is merged with a matching RedefinableElement with isLeaf=true: the resulting RedefinableElement will have isLeaf=false. Default value is false."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The redefinable element that is being redefined by this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the contexts that this element may be redefined from."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qredefinableelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qredefinableelement.cpp" diff --git a/src/mof/qredefinableelement.h b/src/mof/qredefinableelement.h index 258ed5a4..94fe0470 100644 --- a/src/mof/qredefinableelement.h +++ b/src/mof/qredefinableelement.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,8 +68,8 @@ class Q_MOF_EXPORT QRedefinableElement : public QNamedElement Q_OBJECT Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtMof::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtMof::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_DISABLE_COPY(QRedefinableElement) Q_DECLARE_PRIVATE(QRedefinableElement) @@ -94,7 +97,9 @@ protected: explicit QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qredefinableelement_p.h b/src/mof/qredefinableelement_p.h index 47f90dc9..e77c1789 100644 --- a/src/mof/qredefinableelement_p.h +++ b/src/mof/qredefinableelement_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -78,7 +81,9 @@ public: void removeRedefinitionContext(QClassifier *redefinitionContext); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qreflectivecollection.cpp b/src/mof/qreflectivecollection.cpp index 92197667..a563d37d 100644 --- a/src/mof/qreflectivecollection.cpp +++ b/src/mof/qreflectivecollection.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QReflectiveCollectionPrivate::QReflectiveCollectionPrivate() { @@ -112,7 +115,9 @@ void QReflectiveCollection::setPropertyData() QMofObject::setPropertyData(); } -#include "moc_qreflectivecollection.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qreflectivecollection.cpp" diff --git a/src/mof/qreflectivecollection.h b/src/mof/qreflectivecollection.h index 6f059ce8..0d451da0 100644 --- a/src/mof/qreflectivecollection.h +++ b/src/mof/qreflectivecollection.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -78,7 +81,9 @@ protected: explicit QReflectiveCollection(QReflectiveCollectionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qreflectivecollection_p.h b/src/mof/qreflectivecollection_p.h index a16bec74..266c2fbe 100644 --- a/src/mof/qreflectivecollection_p.h +++ b/src/mof/qreflectivecollection_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -65,7 +68,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qreflectivesequence.cpp b/src/mof/qreflectivesequence.cpp index 211634ed..e798baac 100644 --- a/src/mof/qreflectivesequence.cpp +++ b/src/mof/qreflectivesequence.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QReflectiveSequencePrivate::QReflectiveSequencePrivate() { @@ -110,7 +113,9 @@ void QReflectiveSequence::setPropertyData() QReflectiveCollection::setPropertyData(); } -#include "moc_qreflectivesequence.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qreflectivesequence.cpp" diff --git a/src/mof/qreflectivesequence.h b/src/mof/qreflectivesequence.h index 4ec2ac0a..9e0bdf83 100644 --- a/src/mof/qreflectivesequence.h +++ b/src/mof/qreflectivesequence.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -80,7 +83,9 @@ protected: explicit QReflectiveSequence(QReflectiveSequencePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qreflectivesequence_p.h b/src/mof/qreflectivesequence_p.h index 7aa5ffca..a64e532e 100644 --- a/src/mof/qreflectivesequence_p.h +++ b/src/mof/qreflectivesequence_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -66,7 +69,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qrelationship.cpp b/src/mof/qrelationship.cpp index c2adc555..4662a863 100644 --- a/src/mof/qrelationship.cpp +++ b/src/mof/qrelationship.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QRelationshipPrivate::QRelationshipPrivate() { @@ -113,17 +116,19 @@ QSet<QElement *> QRelationship::relatedElements() const void QRelationship::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the elements related by the Relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the elements related by the Relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qrelationship.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qrelationship.cpp" diff --git a/src/mof/qrelationship.h b/src/mof/qrelationship.h index 66ab814f..a64db560 100644 --- a/src/mof/qrelationship.h +++ b/src/mof/qrelationship.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -61,7 +64,7 @@ class Q_MOF_EXPORT QRelationship : public QElement { Q_OBJECT - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtMof::QElement *> relatedElements READ relatedElements) Q_DISABLE_COPY(QRelationship) Q_DECLARE_PRIVATE(QRelationship) @@ -79,7 +82,9 @@ protected: explicit QRelationship(QRelationshipPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qrelationship_p.h b/src/mof/qrelationship_p.h index e4e79647..55492135 100644 --- a/src/mof/qrelationship_p.h +++ b/src/mof/qrelationship_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -70,7 +73,9 @@ public: void removeRelatedElement(QElement *relatedElement); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qslot.cpp b/src/mof/qslot.cpp index c090aecc..cc7eb2ac 100644 --- a/src/mof/qslot.cpp +++ b/src/mof/qslot.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QSlotPrivate::QSlotPrivate() : definingFeature(0), @@ -180,31 +183,33 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance) void QSlot::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value or values corresponding to the defining feature for the owning instance specification."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The structural feature that specifies the values that may be held by the slot."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance specification that owns this slot."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInstanceSpecification::slot"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value or values corresponding to the defining feature for the owning instance specification."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The structural feature that specifies the values that may be held by the slot."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance specification that owns this slot."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInstanceSpecification::slot"); QElement::setPropertyData(); } -#include "moc_qslot.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qslot.cpp" diff --git a/src/mof/qslot.h b/src/mof/qslot.h index c52540cd..6c725b33 100644 --- a/src/mof/qslot.h +++ b/src/mof/qslot.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -66,9 +69,9 @@ class Q_MOF_EXPORT QSlot : public QElement { Q_OBJECT - Q_PROPERTY(QList<QValueSpecification *> values READ values) - Q_PROPERTY(QStructuralFeature * definingFeature READ definingFeature WRITE setDefiningFeature) - Q_PROPERTY(QInstanceSpecification * owningInstance READ owningInstance WRITE setOwningInstance) + Q_PROPERTY(QList<QtMof::QValueSpecification *> values READ values) + Q_PROPERTY(QtMof::QStructuralFeature * definingFeature READ definingFeature WRITE setDefiningFeature) + Q_PROPERTY(QtMof::QInstanceSpecification * owningInstance READ owningInstance WRITE setOwningInstance) Q_DISABLE_COPY(QSlot) Q_DECLARE_PRIVATE(QSlot) @@ -92,7 +95,9 @@ protected: explicit QSlot(QSlotPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qslot_p.h b/src/mof/qslot_p.h index 8324066e..8f779ed1 100644 --- a/src/mof/qslot_p.h +++ b/src/mof/qslot_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -74,7 +77,9 @@ public: QInstanceSpecification *owningInstance; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qstructuralfeature.cpp b/src/mof/qstructuralfeature.cpp index 365b7de9..1fc34f3f 100644 --- a/src/mof/qstructuralfeature.cpp +++ b/src/mof/qstructuralfeature.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QStructuralFeaturePrivate::QStructuralFeaturePrivate() : isReadOnly(false) @@ -143,12 +146,12 @@ void QStructuralFeature::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtMof::VisibilityKind QStructuralFeature::visibility() const +QtMofNS::VisibilityKind QStructuralFeature::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QStructuralFeature::setVisibility(QtMof::VisibilityKind visibility) +void QStructuralFeature::setVisibility(QtMofNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -412,17 +415,19 @@ void QStructuralFeature::unsetReadOnly() void QStructuralFeature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("States whether the feature's value may be modified by a client."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("States whether the feature's value may be modified by a client."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qstructuralfeature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qstructuralfeature.cpp" diff --git a/src/mof/qstructuralfeature.h b/src/mof/qstructuralfeature.h index c3d6493f..8253fc4b 100644 --- a/src/mof/qstructuralfeature.h +++ b/src/mof/qstructuralfeature.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -61,30 +64,30 @@ class Q_MOF_EXPORT QStructuralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtMof::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtMof::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtMof::QClassifier *> featuringClassifiers READ featuringClassifiers) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtMof::QType * type READ type WRITE setType) Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtMof::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtMof::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) @@ -105,8 +108,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -168,7 +171,9 @@ private: QMultiplicityElement *_wrappedMultiplicityElement; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qstructuralfeature_p.h b/src/mof/qstructuralfeature_p.h index 5977d9a7..b29ac915 100644 --- a/src/mof/qstructuralfeature_p.h +++ b/src/mof/qstructuralfeature_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -66,7 +69,9 @@ public: bool isReadOnly; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qtag.cpp b/src/mof/qtag.cpp index fe622738..49e1d2a8 100644 --- a/src/mof/qtag.cpp +++ b/src/mof/qtag.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QTagPrivate::QTagPrivate() : tagOwner(0) @@ -160,38 +163,40 @@ void QTag::setTagOwner(QElement *tagOwner) void QTag::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("elements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("elements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("elements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("elements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("elements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("elements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("elements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("elements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("elements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("elements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("elements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("elements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTag")][QString::fromLatin1("tagOwner")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qtag.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qtag.cpp" diff --git a/src/mof/qtag.h b/src/mof/qtag.h index 7660d0ad..9d69aa36 100644 --- a/src/mof/qtag.h +++ b/src/mof/qtag.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -62,10 +65,10 @@ class Q_MOF_EXPORT QTag : public QElement { Q_OBJECT - Q_PROPERTY(QSet<QElement *> elements READ elements) + Q_PROPERTY(QSet<QtMof::QElement *> elements READ elements) Q_PROPERTY(QString value READ value WRITE setValue) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QElement * tagOwner READ tagOwner WRITE setTagOwner) + Q_PROPERTY(QtMof::QElement * tagOwner READ tagOwner WRITE setTagOwner) Q_DISABLE_COPY(QTag) Q_DECLARE_PRIVATE(QTag) @@ -91,7 +94,9 @@ protected: explicit QTag(QTagPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qtag_p.h b/src/mof/qtag_p.h index 11251f8b..fe320acd 100644 --- a/src/mof/qtag_p.h +++ b/src/mof/qtag_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) class QTag; @@ -71,7 +74,9 @@ public: QElement *tagOwner; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qtmofglobal.h b/src/mof/qtmofglobal.h index 1c0bd67c..edd1814c 100644 --- a/src/mof/qtmofglobal.h +++ b/src/mof/qtmofglobal.h @@ -60,8 +60,6 @@ QT_BEGIN_HEADER #if defined(Q_MOC_RUN) #define QT_NAMESPACE_QTMOF -#define QT_BEGIN_NAMESPACE_QTMOF -#define QT_END_NAMESPACE_QTMOF #define QT_USE_NAMESPACE_QTMOF #define QT_PREPEND_NAMESPACE_QTMOF(name) ::name @@ -73,8 +71,6 @@ QT_BEGIN_HEADER # define QT_NAMESPACE_QTMOF QtMof #endif -#define QT_BEGIN_NAMESPACE_QTMOF QT_BEGIN_NAMESPACE namespace QtMof { -#define QT_END_NAMESPACE_QTMOF QT_END_NAMESPACE } #define QT_USE_NAMESPACE_QTMOF using namespace ::QT_NAMESPACE_QTMOF; #define QT_PREPEND_NAMESPACE_QTMOF(name) ::QT_NAMESPACE_QTMOF::name diff --git a/src/mof/qtmofnamespace.cpp b/src/mof/qtmofnamespace.cpp index f1c54322..f3ca11e3 100644 --- a/src/mof/qtmofnamespace.cpp +++ b/src/mof/qtmofnamespace.cpp @@ -41,14 +41,10 @@ #include "qtmofnamespace.h" -QT_BEGIN_NAMESPACE_QTMOF - -QtMof::QtMof() -{ -} +QT_BEGIN_NAMESPACE /*! - \enum QtMof::QtMof::AggregationKind + \enum QtMofNS::AggregationKind AggregationKind is an enumeration type that specifies the literals for defining the kind of aggregation of a property. @@ -61,7 +57,7 @@ QtMof::QtMof() */ /*! - \enum QtMof::QtMof::ParameterDirectionKind + \enum QtMofNS::ParameterDirectionKind Parameter direction kind is an enumeration type that defines literals used to specify direction of parameters. @@ -75,7 +71,7 @@ QtMof::QtMof() */ /*! - \enum QtMof::QtMof::VisibilityKind + \enum QtMofNS::VisibilityKind VisibilityKind is an enumeration type that defines literals to determine the visibility of elements in a model. @@ -85,7 +81,5 @@ QtMof::QtMof() \value VisibilityPackage */ -#include "moc_qtmofnamespace.cpp" - -QT_END_NAMESPACE_QTMOF +QT_END_NAMESPACE diff --git a/src/mof/qtmofnamespace.h b/src/mof/qtmofnamespace.h index 8b454036..a5a15299 100644 --- a/src/mof/qtmofnamespace.h +++ b/src/mof/qtmofnamespace.h @@ -47,11 +47,11 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE QT_MODULE(QtMof) -class Q_MOF_EXPORT QtMof : public QObject +class Q_MOF_EXPORT QtMofNS : public QObject { Q_OBJECT @@ -81,11 +81,9 @@ public: VisibilityPackage }; -private: - explicit QtMof(); }; -QT_END_NAMESPACE_QTMOF +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qtype.cpp b/src/mof/qtype.cpp index 857dd758..998118db 100644 --- a/src/mof/qtype.cpp +++ b/src/mof/qtype.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QTypePrivate::QTypePrivate() : package(0) @@ -139,17 +142,19 @@ bool QType::isInstance(const QMofObject *object) const void QType::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the owning package of this classifier, if any."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::ownedType"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QType")][QString::fromLatin1("package")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QType")][QString::fromLatin1("package")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QType")][QString::fromLatin1("package")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the owning package of this classifier, if any."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QType")][QString::fromLatin1("package")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QType")][QString::fromLatin1("package")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QType")][QString::fromLatin1("package")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::ownedType"); QPackageableElement::setPropertyData(); } -#include "moc_qtype.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qtype.cpp" diff --git a/src/mof/qtype.h b/src/mof/qtype.h index 74d10688..d559f760 100644 --- a/src/mof/qtype.h +++ b/src/mof/qtype.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -62,7 +65,7 @@ class Q_MOF_EXPORT QType : public QPackageableElement { Q_OBJECT - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtMof::QPackage * package READ package WRITE setPackage) Q_DISABLE_COPY(QType) Q_DECLARE_PRIVATE(QType) @@ -85,7 +88,9 @@ protected: explicit QType(QTypePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qtype_p.h b/src/mof/qtype_p.h index 733ce77c..7602e32f 100644 --- a/src/mof/qtype_p.h +++ b/src/mof/qtype_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -68,7 +71,9 @@ public: QPackage *package; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qtypedelement.cpp b/src/mof/qtypedelement.cpp index d2b16883..16fb4353 100644 --- a/src/mof/qtypedelement.cpp +++ b/src/mof/qtypedelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QTypedElementPrivate::QTypedElementPrivate() : type(0) @@ -108,17 +111,19 @@ void QTypedElement::setType(QType *type) void QTypedElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of the TypedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of the TypedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtMof::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qtypedelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qtypedelement.cpp" diff --git a/src/mof/qtypedelement.h b/src/mof/qtypedelement.h index 1e430df9..6ce8de54 100644 --- a/src/mof/qtypedelement.h +++ b/src/mof/qtypedelement.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -61,7 +64,7 @@ class Q_MOF_EXPORT QTypedElement : public QNamedElement { Q_OBJECT - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtMof::QType * type READ type WRITE setType) Q_DISABLE_COPY(QTypedElement) Q_DECLARE_PRIVATE(QTypedElement) @@ -80,7 +83,9 @@ protected: explicit QTypedElement(QTypedElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qtypedelement_p.h b/src/mof/qtypedelement_p.h index 4ebdc52c..fa6f2e2a 100644 --- a/src/mof/qtypedelement_p.h +++ b/src/mof/qtypedelement_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -66,7 +69,9 @@ public: QType *type; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/quriextent.cpp b/src/mof/quriextent.cpp index e22aa54f..f0816e87 100644 --- a/src/mof/quriextent.cpp +++ b/src/mof/quriextent.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QURIExtentPrivate::QURIExtentPrivate() { @@ -101,7 +104,9 @@ void QURIExtent::setPropertyData() QExtent::setPropertyData(); } -#include "moc_quriextent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_quriextent.cpp" diff --git a/src/mof/quriextent.h b/src/mof/quriextent.h index 3f91bcf3..ab3ccf0d 100644 --- a/src/mof/quriextent.h +++ b/src/mof/quriextent.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -82,7 +85,9 @@ protected: explicit QURIExtent(QURIExtentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/quriextent_p.h b/src/mof/quriextent_p.h index 75776bfd..c6074ae4 100644 --- a/src/mof/quriextent_p.h +++ b/src/mof/quriextent_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -69,7 +72,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qvaluespecification.cpp b/src/mof/qvaluespecification.cpp index d36211c8..07c6b9fb 100644 --- a/src/mof/qvaluespecification.cpp +++ b/src/mof/qvaluespecification.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QValueSpecificationPrivate::QValueSpecificationPrivate() { @@ -164,19 +167,19 @@ QNamespace *QValueSpecification::namespace_() const /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtMof::VisibilityKind QValueSpecification::visibility() const +QtMofNS::VisibilityKind QValueSpecification::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QValueSpecification::setVisibility(QtMof::VisibilityKind visibility) +void QValueSpecification::setVisibility(QtMofNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QValueSpecification::unsetVisibility() { - setVisibility(QtMof::VisibilityPublic); + setVisibility(QtMofNS::VisibilityPublic); Q_D(QValueSpecification); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -273,7 +276,9 @@ void QValueSpecification::setPropertyData() QWrappedObject::setPropertyData(); } -#include "moc_qvaluespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTMOF +#include "moc_qvaluespecification.cpp" diff --git a/src/mof/qvaluespecification.h b/src/mof/qvaluespecification.h index 51775f98..e7a1e66e 100644 --- a/src/mof/qvaluespecification.h +++ b/src/mof/qvaluespecification.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -63,17 +66,17 @@ class Q_MOF_EXPORT QValueSpecification : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtMof::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtMof::QElement * owner READ owner) + Q_PROPERTY(QSet<QtMof::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QtMof::QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QtMof::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtMofNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtMof::QType * type READ type WRITE setType) Q_DISABLE_COPY(QValueSpecification) Q_DECLARE_PRIVATE(QValueSpecification) @@ -98,8 +101,8 @@ public: Q_INVOKABLE QNamespace *namespace_() const; // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtMof::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility); + Q_INVOKABLE QtMofNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtMofNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QTypedElement @@ -125,7 +128,9 @@ private: QTypedElement *_wrappedTypedElement; }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/mof/qvaluespecification_p.h b/src/mof/qvaluespecification_p.h index 02a1c449..2a668f24 100644 --- a/src/mof/qvaluespecification_p.h +++ b/src/mof/qvaluespecification_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTMOF +QT_BEGIN_NAMESPACE + +namespace QtMof +{ QT_MODULE(QtMof) @@ -67,7 +70,9 @@ public: }; -QT_END_NAMESPACE_QTMOF +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qabstraction.cpp b/src/uml/qabstraction.cpp index 6c806a92..30fe13dd 100644 --- a/src/uml/qabstraction.cpp +++ b/src/uml/qabstraction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAbstractionPrivate::QAbstractionPrivate() : mapping(0) @@ -116,17 +119,19 @@ void QAbstraction::setMapping(QOpaqueExpression *mapping) void QAbstraction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An composition of an Expression that states the abstraction relationship between the supplier and the client. In some cases, such as Derivation, it is usually formal and unidirectional; in other cases, such as Trace, it is usually informal and bidirectional. The mapping expression is optional and may be omitted if the precise relationship between the elements is not specified."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An composition of an Expression that states the abstraction relationship between the supplier and the client. In some cases, such as Derivation, it is usually formal and unidirectional; in other cases, such as Trace, it is usually informal and bidirectional. The mapping expression is optional and may be omitted if the precise relationship between the elements is not specified."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDependency::setPropertyData(); } -#include "moc_qabstraction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qabstraction.cpp" diff --git a/src/uml/qabstraction.h b/src/uml/qabstraction.h index 61a2a893..2e71002b 100644 --- a/src/uml/qabstraction.h +++ b/src/uml/qabstraction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QAbstraction : public QDependency { Q_OBJECT - Q_PROPERTY(QOpaqueExpression * mapping READ mapping WRITE setMapping) + Q_PROPERTY(QtUml::QOpaqueExpression * mapping READ mapping WRITE setMapping) Q_DISABLE_COPY(QAbstraction) Q_DECLARE_PRIVATE(QAbstraction) @@ -80,7 +83,9 @@ protected: explicit QAbstraction(QAbstractionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qabstraction_p.h b/src/uml/qabstraction_p.h index 04dad843..4d7dc1b6 100644 --- a/src/uml/qabstraction_p.h +++ b/src/uml/qabstraction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOpaqueExpression *mapping; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qacceptcallaction.cpp b/src/uml/qacceptcallaction.cpp index 5b1873f3..fda07446 100644 --- a/src/uml/qacceptcallaction.cpp +++ b/src/uml/qacceptcallaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAcceptCallActionPrivate::QAcceptCallActionPrivate() : returnInformation(0) @@ -116,17 +119,19 @@ void QAcceptCallAction::setReturnInformation(QOutputPin *returnInformation) void QAcceptCallAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pin where a value is placed containing sufficient information to perform a subsequent reply and return control to the caller. The contents of this value are opaque. It can be passed and copied but it cannot be manipulated by the model."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pin where a value is placed containing sufficient information to perform a subsequent reply and return control to the caller. The contents of this value are opaque. It can be passed and copied but it cannot be manipulated by the model."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAcceptEventAction::setPropertyData(); } -#include "moc_qacceptcallaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qacceptcallaction.cpp" diff --git a/src/uml/qacceptcallaction.h b/src/uml/qacceptcallaction.h index 1da06e3e..f74f1b61 100644 --- a/src/uml/qacceptcallaction.h +++ b/src/uml/qacceptcallaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QAcceptCallAction : public QAcceptEventAction { Q_OBJECT - Q_PROPERTY(QOutputPin * returnInformation READ returnInformation WRITE setReturnInformation) + Q_PROPERTY(QtUml::QOutputPin * returnInformation READ returnInformation WRITE setReturnInformation) Q_DISABLE_COPY(QAcceptCallAction) Q_DECLARE_PRIVATE(QAcceptCallAction) @@ -80,7 +83,9 @@ protected: explicit QAcceptCallAction(QAcceptCallActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qacceptcallaction_p.h b/src/uml/qacceptcallaction_p.h index 2918669a..a9237699 100644 --- a/src/uml/qacceptcallaction_p.h +++ b/src/uml/qacceptcallaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOutputPin *returnInformation; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaccepteventaction.cpp b/src/uml/qaccepteventaction.cpp index a5cb8dbc..69363d8c 100644 --- a/src/uml/qaccepteventaction.cpp +++ b/src/uml/qaccepteventaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAcceptEventActionPrivate::QAcceptEventActionPrivate() : isUnmarshall(false) @@ -195,31 +198,33 @@ void QAcceptEventAction::removeResult(QOutputPin *result) void QAcceptEventAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether there is a single output pin for the event, or multiple output pins for attributes of the event."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of events accepted by the action, as specified by triggers. For triggers with signal events, a signal of the specified type or any subtype of the specified signal type is accepted."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pins holding the received event objects or their attributes. Event objects may be copied in transmission, so identity might not be preserved."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether there is a single output pin for the event, or multiple output pins for attributes of the event."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of events accepted by the action, as specified by triggers. For triggers with signal events, a signal of the specified type or any subtype of the specified signal type is accepted."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("triggers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pins holding the received event objects or their attributes. Event objects may be copied in transmission, so identity might not be preserved."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAcceptEventAction")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qaccepteventaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qaccepteventaction.cpp" diff --git a/src/uml/qaccepteventaction.h b/src/uml/qaccepteventaction.h index 3ce7e4d2..d59d1830 100644 --- a/src/uml/qaccepteventaction.h +++ b/src/uml/qaccepteventaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,8 +69,8 @@ class Q_UML_EXPORT QAcceptEventAction : public QAction Q_OBJECT Q_PROPERTY(bool isUnmarshall READ isUnmarshall WRITE setUnmarshall RESET unsetUnmarshall) - Q_PROPERTY(QSet<QTrigger *> triggers READ triggers) - Q_PROPERTY(QSet<QOutputPin *> results READ results) + Q_PROPERTY(QSet<QtUml::QTrigger *> triggers READ triggers) + Q_PROPERTY(QSet<QtUml::QOutputPin *> results READ results) Q_DISABLE_COPY(QAcceptEventAction) Q_DECLARE_PRIVATE(QAcceptEventAction) @@ -95,7 +98,9 @@ protected: explicit QAcceptEventAction(QAcceptEventActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaccepteventaction_p.h b/src/uml/qaccepteventaction_p.h index ca5a7c45..6e0ea5a6 100644 --- a/src/uml/qaccepteventaction_p.h +++ b/src/uml/qaccepteventaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QSet<QOutputPin *> results; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaction.cpp b/src/uml/qaction.cpp index d9ebe8c7..c7675a0f 100644 --- a/src/uml/qaction.cpp +++ b/src/uml/qaction.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActionPrivate::QActionPrivate() : isLocallyReentrant(false) @@ -279,52 +282,54 @@ QList<QOutputPin *> QAction::outputs() const void QAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the action can begin a new, concurrent execution, even if there is already another execution of the action ongoing. If false, the action cannot begin a new execution until any previous execution has completed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier that owns the behavior of which this action is a part."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint that must be satisfied when executed is completed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint that must be satisfied when execution is started."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of input pins connected to the Action. These are among the total set of inputs."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of output pins connected to the Action. The action places its results onto pins in this set."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the action can begin a new, concurrent execution, even if there is already another execution of the action ongoing. If false, the action cannot begin a new execution until any previous execution has completed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier that owns the behavior of which this action is a part."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint that must be satisfied when executed is completed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPostconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint that must be satisfied when execution is started."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("localPreconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of input pins connected to the Action. These are among the total set of inputs."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("inputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of output pins connected to the Action. The action places its results onto pins in this set."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAction")][QString::fromLatin1("outputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QExecutableNode::setPropertyData(); } -#include "moc_qaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qaction.cpp" diff --git a/src/uml/qaction.h b/src/uml/qaction.h index 8b9113d7..8ea1357b 100644 --- a/src/uml/qaction.h +++ b/src/uml/qaction.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,11 +72,11 @@ class Q_UML_EXPORT QAction : public QExecutableNode Q_OBJECT Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant) - Q_PROPERTY(QClassifier * context READ context STORED false) - Q_PROPERTY(QSet<QConstraint *> localPostconditions READ localPostconditions) - Q_PROPERTY(QSet<QConstraint *> localPreconditions READ localPreconditions) - Q_PROPERTY(QList<QInputPin *> inputs READ inputs) - Q_PROPERTY(QList<QOutputPin *> outputs READ outputs) + Q_PROPERTY(QtUml::QClassifier * context READ context STORED false) + Q_PROPERTY(QSet<QtUml::QConstraint *> localPostconditions READ localPostconditions) + Q_PROPERTY(QSet<QtUml::QConstraint *> localPreconditions READ localPreconditions) + Q_PROPERTY(QList<QtUml::QInputPin *> inputs READ inputs) + Q_PROPERTY(QList<QtUml::QOutputPin *> outputs READ outputs) Q_DISABLE_COPY(QAction) Q_DECLARE_PRIVATE(QAction) @@ -104,7 +107,9 @@ protected: explicit QAction(QActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaction_p.h b/src/uml/qaction_p.h index 5fb36ca6..8b73e5a6 100644 --- a/src/uml/qaction_p.h +++ b/src/uml/qaction_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -83,7 +86,9 @@ public: void removeOutput(QOutputPin *output); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactionexecutionspecification.cpp b/src/uml/qactionexecutionspecification.cpp index f3bcbbc0..d9a5ebe9 100644 --- a/src/uml/qactionexecutionspecification.cpp +++ b/src/uml/qactionexecutionspecification.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActionExecutionSpecificationPrivate::QActionExecutionSpecificationPrivate() : action(0) @@ -108,17 +111,19 @@ void QActionExecutionSpecification::setAction(QAction *action) void QActionExecutionSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Action whose execution is occurring."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Action whose execution is occurring."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QExecutionSpecification::setPropertyData(); } -#include "moc_qactionexecutionspecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactionexecutionspecification.cpp" diff --git a/src/uml/qactionexecutionspecification.h b/src/uml/qactionexecutionspecification.h index bcdc496c..b1af3cc7 100644 --- a/src/uml/qactionexecutionspecification.h +++ b/src/uml/qactionexecutionspecification.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QActionExecutionSpecification : public QExecutionSpecificatio { Q_OBJECT - Q_PROPERTY(QAction * action READ action WRITE setAction) + Q_PROPERTY(QtUml::QAction * action READ action WRITE setAction) Q_DISABLE_COPY(QActionExecutionSpecification) Q_DECLARE_PRIVATE(QActionExecutionSpecification) @@ -80,7 +83,9 @@ protected: explicit QActionExecutionSpecification(QActionExecutionSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactionexecutionspecification_p.h b/src/uml/qactionexecutionspecification_p.h index d57d568b..ebfb0850 100644 --- a/src/uml/qactionexecutionspecification_p.h +++ b/src/uml/qactionexecutionspecification_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QAction *action; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactioninputpin.cpp b/src/uml/qactioninputpin.cpp index d8c60c91..8d9687fb 100644 --- a/src/uml/qactioninputpin.cpp +++ b/src/uml/qactioninputpin.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActionInputPinPrivate::QActionInputPinPrivate() : fromAction(0) @@ -116,17 +119,19 @@ void QActionInputPin::setFromAction(QAction *fromAction) void QActionInputPin::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The action used to provide values."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The action used to provide values."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInputPin::setPropertyData(); } -#include "moc_qactioninputpin.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactioninputpin.cpp" diff --git a/src/uml/qactioninputpin.h b/src/uml/qactioninputpin.h index be49304f..a6acd4f9 100644 --- a/src/uml/qactioninputpin.h +++ b/src/uml/qactioninputpin.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QActionInputPin : public QInputPin { Q_OBJECT - Q_PROPERTY(QAction * fromAction READ fromAction WRITE setFromAction) + Q_PROPERTY(QtUml::QAction * fromAction READ fromAction WRITE setFromAction) Q_DISABLE_COPY(QActionInputPin) Q_DECLARE_PRIVATE(QActionInputPin) @@ -80,7 +83,9 @@ protected: explicit QActionInputPin(QActionInputPinPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactioninputpin_p.h b/src/uml/qactioninputpin_p.h index f08a683a..7da6e775 100644 --- a/src/uml/qactioninputpin_p.h +++ b/src/uml/qactioninputpin_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QAction *fromAction; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivity.cpp b/src/uml/qactivity.cpp index f5446c8d..020378c2 100644 --- a/src/uml/qactivity.cpp +++ b/src/uml/qactivity.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActivityPrivate::QActivityPrivate() : isReadOnly(false), @@ -409,61 +412,61 @@ void QActivity::removeEdge(QActivityEdge *edge) void QActivity::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, this activity must not make any changes to variables outside the activity or to objects. (This is an assertion, not an executable property. It may be used by an execution engine to optimize model execution. If the assertion is violated by the action, then the model is ill-formed.) The default is false (an activity may make nonlocal changes)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, all invocations of the activity are handled by the same execution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level partitions in the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivity::groups"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes coordinated by the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::activity"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level variables in the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVariable::activityScope"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level structured nodes in the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivity::groups QActivity::nodes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::activity"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level groups in the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::inActivity"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges expressing flow between nodes of the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::activity"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, this activity must not make any changes to variables outside the activity or to objects. (This is an assertion, not an executable property. It may be used by an execution engine to optimize model execution. If the assertion is violated by the action, then the model is ill-formed.) The default is false (an activity may make nonlocal changes)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, all invocations of the activity are handled by the same execution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("isSingleExecution")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level partitions in the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivity::groups"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("partitions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes coordinated by the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::activity"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level variables in the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("variables")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVariable::activityScope"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level structured nodes in the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivity::groups QActivity::nodes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("structuredNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::activity"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Top-level groups in the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("groups")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::inActivity"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges expressing flow between nodes of the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivity")][QString::fromLatin1("edges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::activity"); QBehavior::setPropertyData(); } @@ -500,7 +503,9 @@ void QActivity::removeNode(QWrappedObjectPointer<QStructuredActivityNode> struct removeStructuredNode(structuredNode); } -#include "moc_qactivity.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactivity.cpp" diff --git a/src/uml/qactivity.h b/src/uml/qactivity.h index 21be0e18..3f949b05 100644 --- a/src/uml/qactivity.h +++ b/src/uml/qactivity.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,12 +76,12 @@ class Q_UML_EXPORT QActivity : public QBehavior Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) Q_PROPERTY(bool isSingleExecution READ isSingleExecution WRITE setSingleExecution RESET unsetSingleExecution) - Q_PROPERTY(QSet<QActivityPartition *> partitions READ partitions) - Q_PROPERTY(QSet<QActivityNode *> nodes READ nodes) - Q_PROPERTY(QSet<QVariable *> variables READ variables) - Q_PROPERTY(QSet<QStructuredActivityNode *> structuredNodes READ structuredNodes) - Q_PROPERTY(QSet<QActivityGroup *> groups READ groups) - Q_PROPERTY(QSet<QActivityEdge *> edges READ edges) + Q_PROPERTY(QSet<QtUml::QActivityPartition *> partitions READ partitions) + Q_PROPERTY(QSet<QtUml::QActivityNode *> nodes READ nodes) + Q_PROPERTY(QSet<QtUml::QVariable *> variables READ variables) + Q_PROPERTY(QSet<QtUml::QStructuredActivityNode *> structuredNodes READ structuredNodes) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> groups READ groups) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> edges READ edges) Q_DISABLE_COPY(QActivity) Q_DECLARE_PRIVATE(QActivity) @@ -129,7 +132,9 @@ protected: explicit QActivity(QActivityPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivity_p.h b/src/uml/qactivity_p.h index 9042d6b2..eb75ade7 100644 --- a/src/uml/qactivity_p.h +++ b/src/uml/qactivity_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -82,7 +85,9 @@ public: QSet<QActivityEdge *> edges; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivityedge.cpp b/src/uml/qactivityedge.cpp index fd12c80f..b8c050fd 100644 --- a/src/uml/qactivityedge.cpp +++ b/src/uml/qactivityedge.cpp @@ -54,7 +54,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActivityEdgePrivate::QActivityEdgePrivate() : source(0), @@ -435,80 +438,82 @@ void QActivityEdge::setTarget(QActivityNode *target) void QActivityEdge::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Node from which tokens are taken when they traverse the edge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::outgoing"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Inherited edges replaced by this edge in a specialization of the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Groups containing the edge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::containedEdge"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specification evaluated at runtime to determine if the edge can be traversed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partitions containing the edge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityEdge::inGroup"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::edge"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity containing the edge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::edge"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Region that the edge can interrupt."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterruptibleActivityRegion::interruptingEdge"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The minimum number of tokens that must traverse the edge at the same time."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Structured activity node containing the edge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityEdge::inGroup QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::edge"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Node to which tokens are put when they traverse the edge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::incoming"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Node from which tokens are taken when they traverse the edge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::outgoing"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Inherited edges replaced by this edge in a specialization of the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("redefinedEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Groups containing the edge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inGroup")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::containedEdge"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specification evaluated at runtime to determine if the edge can be traversed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("guard")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partitions containing the edge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityEdge::inGroup"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inPartition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::edge"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity containing the edge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("activity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::edge"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Region that the edge can interrupt."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("interrupts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterruptibleActivityRegion::interruptingEdge"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The minimum number of tokens that must traverse the edge at the same time."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("weight")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Structured activity node containing the edge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityEdge::inGroup QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::edge"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Node to which tokens are put when they traverse the edge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityEdge")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::incoming"); QRedefinableElement::setPropertyData(); } -#include "moc_qactivityedge.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactivityedge.cpp" diff --git a/src/uml/qactivityedge.h b/src/uml/qactivityedge.h index 99613021..15efca33 100644 --- a/src/uml/qactivityedge.h +++ b/src/uml/qactivityedge.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,16 +73,16 @@ class Q_UML_EXPORT QActivityEdge : public QRedefinableElement { Q_OBJECT - Q_PROPERTY(QActivityNode * source READ source WRITE setSource) - Q_PROPERTY(QSet<QActivityEdge *> redefinedEdges READ redefinedEdges) - Q_PROPERTY(QSet<QActivityGroup *> inGroup READ inGroup) - Q_PROPERTY(QValueSpecification * guard READ guard WRITE setGuard) - Q_PROPERTY(QSet<QActivityPartition *> inPartition READ inPartition) - Q_PROPERTY(QActivity * activity READ activity WRITE setActivity) - Q_PROPERTY(QInterruptibleActivityRegion * interrupts READ interrupts WRITE setInterrupts) - Q_PROPERTY(QValueSpecification * weight READ weight WRITE setWeight) - Q_PROPERTY(QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) - Q_PROPERTY(QActivityNode * target READ target WRITE setTarget) + Q_PROPERTY(QtUml::QActivityNode * source READ source WRITE setSource) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> redefinedEdges READ redefinedEdges) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> inGroup READ inGroup) + Q_PROPERTY(QtUml::QValueSpecification * guard READ guard WRITE setGuard) + Q_PROPERTY(QSet<QtUml::QActivityPartition *> inPartition READ inPartition) + Q_PROPERTY(QtUml::QActivity * activity READ activity WRITE setActivity) + Q_PROPERTY(QtUml::QInterruptibleActivityRegion * interrupts READ interrupts WRITE setInterrupts) + Q_PROPERTY(QtUml::QValueSpecification * weight READ weight WRITE setWeight) + Q_PROPERTY(QtUml::QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) + Q_PROPERTY(QtUml::QActivityNode * target READ target WRITE setTarget) Q_DISABLE_COPY(QActivityEdge) Q_DECLARE_PRIVATE(QActivityEdge) @@ -120,7 +123,9 @@ protected: explicit QActivityEdge(QActivityEdgePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivityedge_p.h b/src/uml/qactivityedge_p.h index d8142d3f..96fba369 100644 --- a/src/uml/qactivityedge_p.h +++ b/src/uml/qactivityedge_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -89,7 +92,9 @@ public: void removeInGroup(QActivityGroup *inGroup); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivityfinalnode.cpp b/src/uml/qactivityfinalnode.cpp index b4274b53..b0302108 100644 --- a/src/uml/qactivityfinalnode.cpp +++ b/src/uml/qactivityfinalnode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActivityFinalNodePrivate::QActivityFinalNodePrivate() { @@ -83,7 +86,9 @@ void QActivityFinalNode::setPropertyData() QFinalNode::setPropertyData(); } -#include "moc_qactivityfinalnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactivityfinalnode.cpp" diff --git a/src/uml/qactivityfinalnode.h b/src/uml/qactivityfinalnode.h index 548efea0..dc36171a 100644 --- a/src/uml/qactivityfinalnode.h +++ b/src/uml/qactivityfinalnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QActivityFinalNode(QActivityFinalNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivityfinalnode_p.h b/src/uml/qactivityfinalnode_p.h index 39420e30..b4700bb0 100644 --- a/src/uml/qactivityfinalnode_p.h +++ b/src/uml/qactivityfinalnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QActivityFinalNode; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivitygroup.cpp b/src/uml/qactivitygroup.cpp index d36d56e2..7ba8f85d 100644 --- a/src/uml/qactivitygroup.cpp +++ b/src/uml/qactivitygroup.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActivityGroupPrivate::QActivityGroupPrivate() : inActivity(0), @@ -275,45 +278,47 @@ QActivityGroup *QActivityGroup::superGroup() const void QActivityGroup::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity containing the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::group"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inGroup"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Groups immediately contained in the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::superGroup"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges immediately contained in the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::inGroup"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Group immediately containing the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::subgroup"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity containing the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::group"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inGroup"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Groups immediately contained in the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("subgroups")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::superGroup"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges immediately contained in the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("containedEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::inGroup"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Group immediately containing the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityGroup")][QString::fromLatin1("superGroup")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::subgroup"); QNamedElement::setPropertyData(); } -#include "moc_qactivitygroup.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactivitygroup.cpp" diff --git a/src/uml/qactivitygroup.h b/src/uml/qactivitygroup.h index 48b17565..94d07776 100644 --- a/src/uml/qactivitygroup.h +++ b/src/uml/qactivitygroup.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,11 +69,11 @@ class Q_UML_EXPORT QActivityGroup : public QNamedElement { Q_OBJECT - Q_PROPERTY(QActivity * inActivity READ inActivity WRITE setInActivity) - Q_PROPERTY(QSet<QActivityNode *> containedNodes READ containedNodes) - Q_PROPERTY(QSet<QActivityGroup *> subgroups READ subgroups) - Q_PROPERTY(QSet<QActivityEdge *> containedEdges READ containedEdges) - Q_PROPERTY(QActivityGroup * superGroup READ superGroup) + Q_PROPERTY(QtUml::QActivity * inActivity READ inActivity WRITE setInActivity) + Q_PROPERTY(QSet<QtUml::QActivityNode *> containedNodes READ containedNodes) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> subgroups READ subgroups) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> containedEdges READ containedEdges) + Q_PROPERTY(QtUml::QActivityGroup * superGroup READ superGroup) Q_DISABLE_COPY(QActivityGroup) Q_DECLARE_PRIVATE(QActivityGroup) @@ -97,7 +100,9 @@ protected: explicit QActivityGroup(QActivityGroupPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivitygroup_p.h b/src/uml/qactivitygroup_p.h index 0f02eb12..b76db000 100644 --- a/src/uml/qactivitygroup_p.h +++ b/src/uml/qactivitygroup_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -85,7 +88,9 @@ public: void setSuperGroup(QActivityGroup *superGroup); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivitynode.cpp b/src/uml/qactivitynode.cpp index 64917cdd..aa11b9d2 100644 --- a/src/uml/qactivitynode.cpp +++ b/src/uml/qactivitynode.cpp @@ -53,7 +53,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActivityNodePrivate::QActivityNodePrivate() : activity(0), @@ -402,66 +405,68 @@ void QActivityNode::removeOutgoing(QActivityEdge *outgoing) void QActivityNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Inherited nodes replaced by this node in a specialization of the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges that have the node as target."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::target"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity containing the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::node"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Groups containing the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::containedNode"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Structured activity node containing the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityNode::inGroup QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::node"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partitions containing the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityNode::inGroup"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::node"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Interruptible regions containing the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityNode::inGroup"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterruptibleActivityRegion::node"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges that have the node as source."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::source"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Inherited nodes replaced by this node in a specialization of the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges that have the node as target."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("incomings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::target"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity containing the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::node"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Groups containing the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inGroup")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityGroup::containedNode"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Structured activity node containing the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityNode::inGroup QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inStructuredNode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::node"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partitions containing the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityNode::inGroup"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inPartition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::node"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Interruptible regions containing the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityNode::inGroup"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("inInterruptibleRegion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterruptibleActivityRegion::node"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges that have the node as source."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityNode")][QString::fromLatin1("outgoings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::source"); QRedefinableElement::setPropertyData(); } -#include "moc_qactivitynode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactivitynode.cpp" diff --git a/src/uml/qactivitynode.h b/src/uml/qactivitynode.h index e127833e..86d9f45c 100644 --- a/src/uml/qactivitynode.h +++ b/src/uml/qactivitynode.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,14 +72,14 @@ class Q_UML_EXPORT QActivityNode : public QRedefinableElement { Q_OBJECT - Q_PROPERTY(QSet<QActivityNode *> redefinedNodes READ redefinedNodes) - Q_PROPERTY(QSet<QActivityEdge *> incomings READ incomings) - Q_PROPERTY(QActivity * activity READ activity WRITE setActivity) - Q_PROPERTY(QSet<QActivityGroup *> inGroup READ inGroup) - Q_PROPERTY(QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) - Q_PROPERTY(QSet<QActivityPartition *> inPartition READ inPartition) - Q_PROPERTY(QSet<QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) - Q_PROPERTY(QSet<QActivityEdge *> outgoings READ outgoings) + Q_PROPERTY(QSet<QtUml::QActivityNode *> redefinedNodes READ redefinedNodes) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> incomings READ incomings) + Q_PROPERTY(QtUml::QActivity * activity READ activity WRITE setActivity) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> inGroup READ inGroup) + Q_PROPERTY(QtUml::QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) + Q_PROPERTY(QSet<QtUml::QActivityPartition *> inPartition READ inPartition) + Q_PROPERTY(QSet<QtUml::QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> outgoings READ outgoings) Q_DISABLE_COPY(QActivityNode) Q_DECLARE_PRIVATE(QActivityNode) @@ -116,7 +119,9 @@ protected: explicit QActivityNode(QActivityNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivitynode_p.h b/src/uml/qactivitynode_p.h index f4e41b8d..f30f2cda 100644 --- a/src/uml/qactivitynode_p.h +++ b/src/uml/qactivitynode_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -86,7 +89,9 @@ public: void removeInGroup(QActivityGroup *inGroup); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivityparameternode.cpp b/src/uml/qactivityparameternode.cpp index bc578fa4..f5e36b07 100644 --- a/src/uml/qactivityparameternode.cpp +++ b/src/uml/qactivityparameternode.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActivityParameterNodePrivate::QActivityParameterNodePrivate() : parameter(0) @@ -108,17 +111,19 @@ void QActivityParameterNode::setParameter(QParameter *parameter) void QActivityParameterNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameter the object node will be accepting or providing values for."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameter the object node will be accepting or providing values for."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QObjectNode::setPropertyData(); } -#include "moc_qactivityparameternode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactivityparameternode.cpp" diff --git a/src/uml/qactivityparameternode.h b/src/uml/qactivityparameternode.h index b7e7ea34..8e8d0166 100644 --- a/src/uml/qactivityparameternode.h +++ b/src/uml/qactivityparameternode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QActivityParameterNode : public QObjectNode { Q_OBJECT - Q_PROPERTY(QParameter * parameter READ parameter WRITE setParameter) + Q_PROPERTY(QtUml::QParameter * parameter READ parameter WRITE setParameter) Q_DISABLE_COPY(QActivityParameterNode) Q_DECLARE_PRIVATE(QActivityParameterNode) @@ -80,7 +83,9 @@ protected: explicit QActivityParameterNode(QActivityParameterNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivityparameternode_p.h b/src/uml/qactivityparameternode_p.h index 1f20f9b4..0f702cb4 100644 --- a/src/uml/qactivityparameternode_p.h +++ b/src/uml/qactivityparameternode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QParameter *parameter; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivitypartition.cpp b/src/uml/qactivitypartition.cpp index 8839566e..14ac11f2 100644 --- a/src/uml/qactivitypartition.cpp +++ b/src/uml/qactivitypartition.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActivityPartitionPrivate::QActivityPartitionPrivate() : isDimension(false), @@ -338,59 +341,61 @@ void QActivityPartition::removeEdge(QActivityEdge *edge) void QActivityPartition::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the partition groups other partitions along a dimension."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the partition represents an entity to which the partitioning structure does not apply."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An element constraining behaviors invoked by nodes in the partition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partitions immediately contained in the partition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::subgroups"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::superPartition"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partition immediately containing the partition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::superGroup"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::subpartition"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedNodes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inPartition"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges immediately contained in the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedEdges"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::inPartition"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the partition groups other partitions along a dimension."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the partition represents an entity to which the partitioning structure does not apply."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("isExternal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An element constraining behaviors invoked by nodes in the partition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("represents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partitions immediately contained in the partition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::subgroups"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("subpartitions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::superPartition"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Partition immediately containing the partition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::superGroup"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("superPartition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityPartition::subpartition"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedNodes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inPartition"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges immediately contained in the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedEdges"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QActivityPartition")][QString::fromLatin1("edges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::inPartition"); QActivityGroup::setPropertyData(); } -#include "moc_qactivitypartition.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactivitypartition.cpp" diff --git a/src/uml/qactivitypartition.h b/src/uml/qactivitypartition.h index 147743f7..7c3a7d41 100644 --- a/src/uml/qactivitypartition.h +++ b/src/uml/qactivitypartition.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,11 +71,11 @@ class Q_UML_EXPORT QActivityPartition : public QActivityGroup Q_PROPERTY(bool isDimension READ isDimension WRITE setDimension RESET unsetDimension) Q_PROPERTY(bool isExternal READ isExternal WRITE setExternal RESET unsetExternal) - Q_PROPERTY(QElement * represents READ represents WRITE setRepresents) - Q_PROPERTY(QSet<QActivityPartition *> subpartitions READ subpartitions) - Q_PROPERTY(QActivityPartition * superPartition READ superPartition WRITE setSuperPartition) - Q_PROPERTY(QSet<QActivityNode *> nodes READ nodes) - Q_PROPERTY(QSet<QActivityEdge *> edges READ edges) + Q_PROPERTY(QtUml::QElement * represents READ represents WRITE setRepresents) + Q_PROPERTY(QSet<QtUml::QActivityPartition *> subpartitions READ subpartitions) + Q_PROPERTY(QtUml::QActivityPartition * superPartition READ superPartition WRITE setSuperPartition) + Q_PROPERTY(QSet<QtUml::QActivityNode *> nodes READ nodes) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> edges READ edges) Q_DISABLE_COPY(QActivityPartition) Q_DECLARE_PRIVATE(QActivityPartition) @@ -110,7 +113,9 @@ protected: explicit QActivityPartition(QActivityPartitionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactivitypartition_p.h b/src/uml/qactivitypartition_p.h index 2e945adf..33b348cd 100644 --- a/src/uml/qactivitypartition_p.h +++ b/src/uml/qactivitypartition_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -78,7 +81,9 @@ public: QSet<QActivityEdge *> edges; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactor.cpp b/src/uml/qactor.cpp index 04694c9f..aa1135c9 100644 --- a/src/uml/qactor.cpp +++ b/src/uml/qactor.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QActorPrivate::QActorPrivate() { @@ -83,7 +86,9 @@ void QActor::setPropertyData() QBehavioredClassifier::setPropertyData(); } -#include "moc_qactor.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qactor.cpp" diff --git a/src/uml/qactor.h b/src/uml/qactor.h index cf276204..f941db71 100644 --- a/src/uml/qactor.h +++ b/src/uml/qactor.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QActor(QActorPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qactor_p.h b/src/uml/qactor_p.h index 907f1acf..d22f0fe7 100644 --- a/src/uml/qactor_p.h +++ b/src/uml/qactor_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QActor; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaddstructuralfeaturevalueaction.cpp b/src/uml/qaddstructuralfeaturevalueaction.cpp index 99fb0863..8c799c18 100644 --- a/src/uml/qaddstructuralfeaturevalueaction.cpp +++ b/src/uml/qaddstructuralfeaturevalueaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAddStructuralFeatureValueActionPrivate::QAddStructuralFeatureValueActionPrivate() : isReplaceAll(false), @@ -150,24 +153,26 @@ void QAddStructuralFeatureValueAction::setInsertAt(QInputPin *insertAt) void QAddStructuralFeatureValueAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether existing values of the structural feature of the object should be removed before adding the new value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the position at which to insert a new value or move an existing value in ordered structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero. This pin is omitted for unordered structural features."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether existing values of the structural feature of the object should be removed before adding the new value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the position at which to insert a new value or move an existing value in ordered structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero. This pin is omitted for unordered structural features."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddStructuralFeatureValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWriteStructuralFeatureAction::setPropertyData(); } -#include "moc_qaddstructuralfeaturevalueaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qaddstructuralfeaturevalueaction.cpp" diff --git a/src/uml/qaddstructuralfeaturevalueaction.h b/src/uml/qaddstructuralfeaturevalueaction.h index 6e58b2f8..1979c448 100644 --- a/src/uml/qaddstructuralfeaturevalueaction.h +++ b/src/uml/qaddstructuralfeaturevalueaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QAddStructuralFeatureValueAction : public QWriteStructuralFea Q_OBJECT Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) - Q_PROPERTY(QInputPin * insertAt READ insertAt WRITE setInsertAt) + Q_PROPERTY(QtUml::QInputPin * insertAt READ insertAt WRITE setInsertAt) Q_DISABLE_COPY(QAddStructuralFeatureValueAction) Q_DECLARE_PRIVATE(QAddStructuralFeatureValueAction) @@ -86,7 +89,9 @@ protected: explicit QAddStructuralFeatureValueAction(QAddStructuralFeatureValueActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaddstructuralfeaturevalueaction_p.h b/src/uml/qaddstructuralfeaturevalueaction_p.h index b3e9810a..71828f3f 100644 --- a/src/uml/qaddstructuralfeaturevalueaction_p.h +++ b/src/uml/qaddstructuralfeaturevalueaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *insertAt; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaddvariablevalueaction.cpp b/src/uml/qaddvariablevalueaction.cpp index a0ea2571..6a982029 100644 --- a/src/uml/qaddvariablevalueaction.cpp +++ b/src/uml/qaddvariablevalueaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAddVariableValueActionPrivate::QAddVariableValueActionPrivate() : isReplaceAll(false), @@ -150,24 +153,26 @@ void QAddVariableValueAction::setInsertAt(QInputPin *insertAt) void QAddVariableValueAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether existing values of the variable should be removed before adding the new value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the position at which to insert a new value or move an existing value in ordered variables. The types is UnlimitedINatural, but the value cannot be zero. This pin is omitted for unordered variables."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether existing values of the variable should be removed before adding the new value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the position at which to insert a new value or move an existing value in ordered variables. The types is UnlimitedINatural, but the value cannot be zero. This pin is omitted for unordered variables."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAddVariableValueAction")][QString::fromLatin1("insertAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWriteVariableAction::setPropertyData(); } -#include "moc_qaddvariablevalueaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qaddvariablevalueaction.cpp" diff --git a/src/uml/qaddvariablevalueaction.h b/src/uml/qaddvariablevalueaction.h index fc9a22fc..9caced71 100644 --- a/src/uml/qaddvariablevalueaction.h +++ b/src/uml/qaddvariablevalueaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QAddVariableValueAction : public QWriteVariableAction Q_OBJECT Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) - Q_PROPERTY(QInputPin * insertAt READ insertAt WRITE setInsertAt) + Q_PROPERTY(QtUml::QInputPin * insertAt READ insertAt WRITE setInsertAt) Q_DISABLE_COPY(QAddVariableValueAction) Q_DECLARE_PRIVATE(QAddVariableValueAction) @@ -86,7 +89,9 @@ protected: explicit QAddVariableValueAction(QAddVariableValueActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qaddvariablevalueaction_p.h b/src/uml/qaddvariablevalueaction_p.h index ca073e58..5e939122 100644 --- a/src/uml/qaddvariablevalueaction_p.h +++ b/src/uml/qaddvariablevalueaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *insertAt; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qanyreceiveevent.cpp b/src/uml/qanyreceiveevent.cpp index b6fcce70..057f7e09 100644 --- a/src/uml/qanyreceiveevent.cpp +++ b/src/uml/qanyreceiveevent.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAnyReceiveEventPrivate::QAnyReceiveEventPrivate() { @@ -83,7 +86,9 @@ void QAnyReceiveEvent::setPropertyData() QMessageEvent::setPropertyData(); } -#include "moc_qanyreceiveevent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qanyreceiveevent.cpp" diff --git a/src/uml/qanyreceiveevent.h b/src/uml/qanyreceiveevent.h index 39a5cbf9..4de3e151 100644 --- a/src/uml/qanyreceiveevent.h +++ b/src/uml/qanyreceiveevent.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QAnyReceiveEvent(QAnyReceiveEventPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qanyreceiveevent_p.h b/src/uml/qanyreceiveevent_p.h index 77c0c565..e1457045 100644 --- a/src/uml/qanyreceiveevent_p.h +++ b/src/uml/qanyreceiveevent_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QAnyReceiveEvent; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qartifact.cpp b/src/uml/qartifact.cpp index b8a4b9f2..c15812b5 100644 --- a/src/uml/qartifact.cpp +++ b/src/uml/qartifact.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QArtifactPrivate::QArtifactPrivate() { @@ -298,19 +301,19 @@ void QArtifact::setOwningTemplateParameter(QTemplateParameter *owningTemplatePar /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QArtifact::visibility() const +QtUmlNS::VisibilityKind QArtifact::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QArtifact::setVisibility(QtUml::VisibilityKind visibility) +void QArtifact::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QArtifact::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QArtifact); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -838,40 +841,40 @@ void QArtifact::removeNestedArtifact(QArtifact *nestedArtifact) void QArtifact::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A concrete name that is used to refer to the Artifact in a physical context. Example: file system name, universal resource locator."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Operations defined for the Artifact. The association is a specialization of the ownedMember association."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes or association ends defined for the Artifact. The association is a specialization of the ownedMember association."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of model elements that are manifested in the Artifact. That is, these model elements are utilized in the construction (or generation) of the artifact."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Artifacts that are defined (nested) within the Artifact. The association is a specialization of the ownedMember association from Namespace to NamedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A concrete name that is used to refer to the Artifact in a physical context. Example: file system name, universal resource locator."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Operations defined for the Artifact. The association is a specialization of the ownedMember association."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes or association ends defined for the Artifact. The association is a specialization of the ownedMember association."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of model elements that are manifested in the Artifact. That is, these model elements are utilized in the construction (or generation) of the artifact."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("manifestations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Artifacts that are defined (nested) within the Artifact. The association is a specialization of the ownedMember association from Namespace to NamedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QArtifact")][QString::fromLatin1("nestedArtifacts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } @@ -888,7 +891,9 @@ void QArtifact::removeClientDependency(QWrappedObjectPointer<QManifestation> man removeManifestation(manifestation); } -#include "moc_qartifact.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qartifact.cpp" diff --git a/src/uml/qartifact.h b/src/uml/qartifact.h index 5f4b9d26..8a9dd742 100644 --- a/src/uml/qartifact.h +++ b/src/uml/qartifact.h @@ -57,7 +57,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,57 +75,57 @@ class Q_UML_EXPORT QArtifact : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtUml::QPackage * package READ package WRITE setPackage) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(QSet<QUseCase *> ownedUseCases READ ownedUseCases) - Q_PROPERTY(QSet<QGeneralizationSet *> powertypeExtents READ powertypeExtents) - Q_PROPERTY(QSet<QUseCase *> useCases READ useCases) - Q_PROPERTY(QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QCollaborationUse *> collaborationUses READ collaborationUses) - Q_PROPERTY(QSet<QProperty *> attributes READ attributes) - Q_PROPERTY(QSet<QFeature *> features READ features) - Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) - Q_PROPERTY(QCollaborationUse * representation READ representation WRITE setRepresentation) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) - Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(QSet<QSubstitution *> substitutions READ substitutions) + Q_PROPERTY(QSet<QtUml::QUseCase *> ownedUseCases READ ownedUseCases) + Q_PROPERTY(QSet<QtUml::QGeneralizationSet *> powertypeExtents READ powertypeExtents) + Q_PROPERTY(QSet<QtUml::QUseCase *> useCases READ useCases) + Q_PROPERTY(QtUml::QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QtUml::QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QCollaborationUse *> collaborationUses READ collaborationUses) + Q_PROPERTY(QSet<QtUml::QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QtUml::QFeature *> features READ features) + Q_PROPERTY(QSet<QtUml::QClassifier *> generals READ generals STORED false) + Q_PROPERTY(QtUml::QCollaborationUse * representation READ representation WRITE setRepresentation) + Q_PROPERTY(QSet<QtUml::QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QtUml::QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QSubstitution *> substitutions READ substitutions) Q_PROPERTY(QString fileName READ fileName WRITE setFileName) - Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) - Q_PROPERTY(QSet<QManifestation *> manifestations READ manifestations) - Q_PROPERTY(QSet<QArtifact *> nestedArtifacts READ nestedArtifacts) + Q_PROPERTY(QList<QtUml::QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QtUml::QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QSet<QtUml::QManifestation *> manifestations READ manifestations) + Q_PROPERTY(QSet<QtUml::QArtifact *> nestedArtifacts READ nestedArtifacts) Q_DISABLE_COPY(QArtifact) Q_DECLARE_PRIVATE(QArtifact) @@ -170,8 +173,8 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QType @@ -267,7 +270,9 @@ private: QClassifier *_wrappedClassifier; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qartifact_p.h b/src/uml/qartifact_p.h index a1d3d744..73ec4824 100644 --- a/src/uml/qartifact_p.h +++ b/src/uml/qartifact_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -80,7 +83,9 @@ public: QSet<QArtifact *> nestedArtifacts; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qassociation.cpp b/src/uml/qassociation.cpp index 7533e89f..09e0bf52 100644 --- a/src/uml/qassociation.cpp +++ b/src/uml/qassociation.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAssociationPrivate::QAssociationPrivate() : isDerived(false) @@ -298,19 +301,19 @@ void QAssociation::setOwningTemplateParameter(QTemplateParameter *owningTemplate /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QAssociation::visibility() const +QtUmlNS::VisibilityKind QAssociation::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QAssociation::setVisibility(QtUml::VisibilityKind visibility) +void QAssociation::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QAssociation::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QAssociation); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -843,45 +846,47 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd) void QAssociation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the association is derived from other model elements such as other associations or constraints."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifiers that are used as types of the ends of the association."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The navigable ends that are owned by the association itself."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAssociation::ownedEnds"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ends that are owned by the association itself."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAssociation::memberEnds QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::owningAssociation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Each end represents participation of instances of the classifier connected to the end in links of the association."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::association"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the association is derived from other model elements such as other associations or constraints."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifiers that are used as types of the ends of the association."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("endTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The navigable ends that are owned by the association itself."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAssociation::ownedEnds"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("navigableOwnedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ends that are owned by the association itself."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAssociation::memberEnds QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("ownedEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::owningAssociation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Each end represents participation of instances of the classifier connected to the end in links of the association."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QAssociation")][QString::fromLatin1("memberEnds")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::association"); QWrappedObject::setPropertyData(); } -#include "moc_qassociation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qassociation.cpp" diff --git a/src/uml/qassociation.h b/src/uml/qassociation.h index da405edc..a355cb2c 100644 --- a/src/uml/qassociation.h +++ b/src/uml/qassociation.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,59 +71,59 @@ class Q_UML_EXPORT QAssociation : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtUml::QPackage * package READ package WRITE setPackage) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(QSet<QUseCase *> ownedUseCases READ ownedUseCases) - Q_PROPERTY(QSet<QGeneralizationSet *> powertypeExtents READ powertypeExtents) - Q_PROPERTY(QSet<QUseCase *> useCases READ useCases) - Q_PROPERTY(QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QCollaborationUse *> collaborationUses READ collaborationUses) - Q_PROPERTY(QSet<QProperty *> attributes READ attributes) - Q_PROPERTY(QSet<QFeature *> features READ features) - Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) - Q_PROPERTY(QCollaborationUse * representation READ representation WRITE setRepresentation) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) - Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(QSet<QSubstitution *> substitutions READ substitutions) - - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtUml::QUseCase *> ownedUseCases READ ownedUseCases) + Q_PROPERTY(QSet<QtUml::QGeneralizationSet *> powertypeExtents READ powertypeExtents) + Q_PROPERTY(QSet<QtUml::QUseCase *> useCases READ useCases) + Q_PROPERTY(QtUml::QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QtUml::QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QCollaborationUse *> collaborationUses READ collaborationUses) + Q_PROPERTY(QSet<QtUml::QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QtUml::QFeature *> features READ features) + Q_PROPERTY(QSet<QtUml::QClassifier *> generals READ generals STORED false) + Q_PROPERTY(QtUml::QCollaborationUse * representation READ representation WRITE setRepresentation) + Q_PROPERTY(QSet<QtUml::QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QtUml::QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QSubstitution *> substitutions READ substitutions) + + Q_PROPERTY(QSet<QtUml::QElement *> relatedElements READ relatedElements) Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) - Q_PROPERTY(QList<QType *> endTypes READ endTypes STORED false) - Q_PROPERTY(QSet<QProperty *> navigableOwnedEnds READ navigableOwnedEnds) - Q_PROPERTY(QList<QProperty *> ownedEnds READ ownedEnds) - Q_PROPERTY(QList<QProperty *> memberEnds READ memberEnds) + Q_PROPERTY(QList<QtUml::QType *> endTypes READ endTypes STORED false) + Q_PROPERTY(QSet<QtUml::QProperty *> navigableOwnedEnds READ navigableOwnedEnds) + Q_PROPERTY(QList<QtUml::QProperty *> ownedEnds READ ownedEnds) + Q_PROPERTY(QList<QtUml::QProperty *> memberEnds READ memberEnds) Q_DISABLE_COPY(QAssociation) Q_DECLARE_PRIVATE(QAssociation) @@ -168,8 +171,8 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QType @@ -263,7 +266,9 @@ private: QRelationship *_wrappedRelationship; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qassociation_p.h b/src/uml/qassociation_p.h index d229c552..721a8896 100644 --- a/src/uml/qassociation_p.h +++ b/src/uml/qassociation_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ public: QList<QProperty *> memberEnds; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qassociationclass.cpp b/src/uml/qassociationclass.cpp index fa10b634..3ddefe9b 100644 --- a/src/uml/qassociationclass.cpp +++ b/src/uml/qassociationclass.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QAssociationClassPrivate::QAssociationClassPrivate() { @@ -87,7 +90,9 @@ void QAssociationClass::setPropertyData() QWrappedObject::setPropertyData(); } -#include "moc_qassociationclass.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qassociationclass.cpp" diff --git a/src/uml/qassociationclass.h b/src/uml/qassociationclass.h index 2d007f56..31255190 100644 --- a/src/uml/qassociationclass.h +++ b/src/uml/qassociationclass.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ private: QAssociation *_wrappedAssociation; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qassociationclass_p.h b/src/uml/qassociationclass_p.h index f15ab63c..0d70080c 100644 --- a/src/uml/qassociationclass_p.h +++ b/src/uml/qassociationclass_p.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QAssociationClass; @@ -65,7 +68,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehavior.cpp b/src/uml/qbehavior.cpp index 1cc21133..c0203c12 100644 --- a/src/uml/qbehavior.cpp +++ b/src/uml/qbehavior.cpp @@ -50,7 +50,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QBehaviorPrivate::QBehaviorPrivate() : isReentrant(true), @@ -351,61 +354,61 @@ QBehavioredClassifier *QBehavior::context() const void QBehavior::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the behavior can be invoked while it is still executing from a previous invocation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates a behavioral feature that the behavior implements. The behavioral feature must be owned by the classifier that owns the behavior or be inherited by it. The parameters of the behavioral feature and the implementing behavior must match. A behavior does not need to have a specification, in which case it either is the classifer behavior of a BehavioredClassifier or it can only be invoked by another behavior of the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QBehavioralFeature::method"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying what is fulfilled after the execution of the behavior is completed, if its precondition was fulfilled before its invocation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying what must be fulfilled when the behavior is invoked."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a behavior that this behavior redefines. A subtype of Behavior may redefine any other subtype of Behavior. If the behavior implements a behavioral feature, it replaces the redefined behavior. If the behavior is a classifier behavior, it extends the redefined behavior."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::redefinedClassifiers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a list of parameters to the behavior which describes the order and type of arguments that can be given when the behavior is invoked and of the values which will be returned when the behavior completes its execution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ParameterSets owned by this Behavior."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier that is the context for the execution of the behavior. If the behavior is owned by a BehavioredClassifier, that classifier is the context. Otherwise, the context is the first BehavioredClassifier reached by following the chain of owner relationships. For example, following this algorithm, the context of an entry action in a state machine is the classifier that owns the state machine. The features of the context classifier as well as the elements visible to the context classifier are visible to the behavior."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the behavior can be invoked while it is still executing from a previous invocation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates a behavioral feature that the behavior implements. The behavioral feature must be owned by the classifier that owns the behavior or be inherited by it. The parameters of the behavioral feature and the implementing behavior must match. A behavior does not need to have a specification, in which case it either is the classifer behavior of a BehavioredClassifier or it can only be invoked by another behavior of the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QBehavioralFeature::method"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying what is fulfilled after the execution of the behavior is completed, if its precondition was fulfilled before its invocation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("postconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying what must be fulfilled when the behavior is invoked."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("preconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a behavior that this behavior redefines. A subtype of Behavior may redefine any other subtype of Behavior. If the behavior implements a behavioral feature, it replaces the redefined behavior. If the behavior is a classifier behavior, it extends the redefined behavior."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::redefinedClassifiers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("redefinedBehaviors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a list of parameters to the behavior which describes the order and type of arguments that can be given when the behavior is invoked and of the values which will be returned when the behavior completes its execution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ParameterSets owned by this Behavior."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier that is the context for the execution of the behavior. If the behavior is owned by a BehavioredClassifier, that classifier is the context. Otherwise, the context is the first BehavioredClassifier reached by following the chain of owner relationships. For example, following this algorithm, the context of an entry action in a state machine is the classifier that owns the state machine. The features of the context classifier as well as the elements visible to the context classifier are visible to the behavior."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavior")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClass::setPropertyData(); } @@ -422,7 +425,9 @@ void QBehavior::removeRedefinedClassifier(QWrappedObjectPointer<QBehavior> redef removeRedefinedBehavior(redefinedBehavior); } -#include "moc_qbehavior.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qbehavior.cpp" diff --git a/src/uml/qbehavior.h b/src/uml/qbehavior.h index 0892310d..174eeccd 100644 --- a/src/uml/qbehavior.h +++ b/src/uml/qbehavior.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,13 +75,13 @@ class Q_UML_EXPORT QBehavior : public QClass Q_OBJECT Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant) - Q_PROPERTY(QBehavioralFeature * specification READ specification WRITE setSpecification) - Q_PROPERTY(QSet<QConstraint *> postconditions READ postconditions) - Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) - Q_PROPERTY(QSet<QBehavior *> redefinedBehaviors READ redefinedBehaviors) - Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) - Q_PROPERTY(QSet<QParameterSet *> ownedParameterSets READ ownedParameterSets) - Q_PROPERTY(QBehavioredClassifier * context READ context STORED false) + Q_PROPERTY(QtUml::QBehavioralFeature * specification READ specification WRITE setSpecification) + Q_PROPERTY(QSet<QtUml::QConstraint *> postconditions READ postconditions) + Q_PROPERTY(QSet<QtUml::QConstraint *> preconditions READ preconditions) + Q_PROPERTY(QSet<QtUml::QBehavior *> redefinedBehaviors READ redefinedBehaviors) + Q_PROPERTY(QList<QtUml::QParameter *> ownedParameters READ ownedParameters) + Q_PROPERTY(QSet<QtUml::QParameterSet *> ownedParameterSets READ ownedParameterSets) + Q_PROPERTY(QtUml::QBehavioredClassifier * context READ context STORED false) Q_DISABLE_COPY(QBehavior) Q_DECLARE_PRIVATE(QBehavior) @@ -122,7 +125,9 @@ protected: explicit QBehavior(QBehaviorPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehavior_p.h b/src/uml/qbehavior_p.h index 00c13a5a..c18a79b7 100644 --- a/src/uml/qbehavior_p.h +++ b/src/uml/qbehavior_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -81,7 +84,9 @@ public: QSet<QParameterSet *> ownedParameterSets; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehavioralfeature.cpp b/src/uml/qbehavioralfeature.cpp index 633caa02..b12eee13 100644 --- a/src/uml/qbehavioralfeature.cpp +++ b/src/uml/qbehavioralfeature.cpp @@ -50,10 +50,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QBehavioralFeaturePrivate::QBehavioralFeaturePrivate() : - concurrency(QtUml::CallConcurrencySequential), + concurrency(QtUmlNS::CallConcurrencySequential), isAbstract(false) { } @@ -148,12 +151,12 @@ void QBehavioralFeature::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QBehavioralFeature::visibility() const +QtUmlNS::VisibilityKind QBehavioralFeature::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QBehavioralFeature::setVisibility(QtUml::VisibilityKind visibility) +void QBehavioralFeature::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -378,7 +381,7 @@ QSet<QClassifier *> QBehavioralFeature::featuringClassifiers() const /*! Specifies the semantics of concurrent calls to the same passive instance (i.e., an instance originating from a class with isActive being false). Active instances control access to their own behavioral features. */ -QtUml::CallConcurrencyKind QBehavioralFeature::concurrency() const +QtUmlNS::CallConcurrencyKind QBehavioralFeature::concurrency() const { // This is a read-write attribute @@ -386,7 +389,7 @@ QtUml::CallConcurrencyKind QBehavioralFeature::concurrency() const return d->concurrency; } -void QBehavioralFeature::setConcurrency(QtUml::CallConcurrencyKind concurrency) +void QBehavioralFeature::setConcurrency(QtUmlNS::CallConcurrencyKind concurrency) { // This is a read-write attribute @@ -399,7 +402,7 @@ void QBehavioralFeature::setConcurrency(QtUml::CallConcurrencyKind concurrency) void QBehavioralFeature::unsetConcurrency() { - setConcurrency(QtUml::CallConcurrencySequential); + setConcurrency(QtUmlNS::CallConcurrencySequential); Q_D(QBehavioralFeature); d->modifiedResettableProperties.removeAll(QString::fromLatin1("concurrency")); } @@ -593,52 +596,54 @@ bool QBehavioralFeature::isDistinguishableFrom(const QNamedElement *n, const QNa void QBehavioralFeature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the semantics of concurrent calls to the same passive instance (i.e., an instance originating from a class with isActive being false). Active instances control access to their own behavioral features."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, then the behavioral feature does not have an implementation, and one must be supplied by a more specific element. If false, the behavioral feature must have an implementation in the classifier or one must be inherited from a more general element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this feature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the ordered set of formal parameters of this BehavioralFeature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ParameterSets owned by this BehavioralFeature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A behavioral description that implements the behavioral feature. There may be at most one behavior for a particular pairing of a classifier (as owner of the behavior) and a behavioral feature (as specification of the behavior)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QBehavior::specification"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the semantics of concurrent calls to the same passive instance (i.e., an instance originating from a class with isActive being false). Active instances control access to their own behavioral features."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, then the behavioral feature does not have an implementation, and one must be supplied by a more specific element. If false, the behavioral feature must have an implementation in the classifier or one must be inherited from a more general element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this feature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the ordered set of formal parameters of this BehavioralFeature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ParameterSets owned by this BehavioralFeature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("ownedParameterSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A behavioral description that implements the behavioral feature. There may be at most one behavior for a particular pairing of a classifier (as owner of the behavior) and a behavioral feature (as specification of the behavior)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioralFeature")][QString::fromLatin1("methods")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QBehavior::specification"); QWrappedObject::setPropertyData(); } -#include "moc_qbehavioralfeature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qbehavioralfeature.cpp" diff --git a/src/uml/qbehavioralfeature.h b/src/uml/qbehavioralfeature.h index 73b7a602..a0d11ced 100644 --- a/src/uml/qbehavioralfeature.h +++ b/src/uml/qbehavioralfeature.h @@ -57,7 +57,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,37 +77,37 @@ class Q_UML_EXPORT QBehavioralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtUml::QClassifier *> featuringClassifiers READ featuringClassifiers) - Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency) + Q_PROPERTY(QtUmlNS::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) - Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) - Q_PROPERTY(QSet<QParameterSet *> ownedParameterSets READ ownedParameterSets) - Q_PROPERTY(QSet<QBehavior *> methods READ methods) + Q_PROPERTY(QSet<QtUml::QType *> raisedExceptions READ raisedExceptions) + Q_PROPERTY(QList<QtUml::QParameter *> ownedParameters READ ownedParameters) + Q_PROPERTY(QSet<QtUml::QParameterSet *> ownedParameterSets READ ownedParameterSets) + Q_PROPERTY(QSet<QtUml::QBehavior *> methods READ methods) Q_DISABLE_COPY(QBehavioralFeature) Q_DECLARE_PRIVATE(QBehavioralFeature) @@ -123,8 +126,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -167,8 +170,8 @@ public: Q_INVOKABLE QSet<QClassifier *> featuringClassifiers() const; // Attributes from QBehavioralFeature - Q_INVOKABLE QtUml::CallConcurrencyKind concurrency() const; - Q_INVOKABLE void setConcurrency(QtUml::CallConcurrencyKind concurrency); + Q_INVOKABLE QtUmlNS::CallConcurrencyKind concurrency() const; + Q_INVOKABLE void setConcurrency(QtUmlNS::CallConcurrencyKind concurrency); Q_INVOKABLE void unsetConcurrency(); Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE void setAbstract(bool isAbstract); @@ -201,7 +204,9 @@ private: QFeature *_wrappedFeature; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehavioralfeature_p.h b/src/uml/qbehavioralfeature_p.h index 82397c55..93b3000c 100644 --- a/src/uml/qbehavioralfeature_p.h +++ b/src/uml/qbehavioralfeature_p.h @@ -57,7 +57,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -76,7 +79,7 @@ public: explicit QBehavioralFeaturePrivate(); virtual ~QBehavioralFeaturePrivate(); - QtUml::CallConcurrencyKind concurrency; + QtUmlNS::CallConcurrencyKind concurrency; bool isAbstract; QSet<QType *> raisedExceptions; QList<QParameter *> ownedParameters; @@ -84,7 +87,9 @@ public: QSet<QBehavior *> methods; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehavioredclassifier.cpp b/src/uml/qbehavioredclassifier.cpp index bf7c7456..2663bf04 100644 --- a/src/uml/qbehavioredclassifier.cpp +++ b/src/uml/qbehavioredclassifier.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QBehavioredClassifierPrivate::QBehavioredClassifierPrivate() : classifierBehavior(0) @@ -199,26 +202,26 @@ void QBehavioredClassifier::setClassifierBehavior(QBehavior *classifierBehavior) void QBehavioredClassifier::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References behavior specifications owned by a classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterfaceRealization::implementingClassifier"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A behavior specification that specifies the behavior of the classifier itself."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QBehavioredClassifier::ownedBehaviors"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References behavior specifications owned by a classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of InterfaceRealizations owned by the BehavioredClassifier. Interface realizations reference the Interfaces of which the BehavioredClassifier is an implementation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("interfaceRealizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterfaceRealization::implementingClassifier"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A behavior specification that specifies the behavior of the classifier itself."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QBehavioredClassifier::ownedBehaviors"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehavioredClassifier")][QString::fromLatin1("classifierBehavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClassifier::setPropertyData(); } @@ -235,7 +238,9 @@ void QBehavioredClassifier::removeClientDependency(QWrappedObjectPointer<QInterf removeInterfaceRealization(interfaceRealization); } -#include "moc_qbehavioredclassifier.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qbehavioredclassifier.cpp" diff --git a/src/uml/qbehavioredclassifier.h b/src/uml/qbehavioredclassifier.h index 41d3e24f..4b4adec2 100644 --- a/src/uml/qbehavioredclassifier.h +++ b/src/uml/qbehavioredclassifier.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,9 +70,9 @@ class Q_UML_EXPORT QBehavioredClassifier : public QClassifier { Q_OBJECT - Q_PROPERTY(QSet<QBehavior *> ownedBehaviors READ ownedBehaviors) - Q_PROPERTY(QSet<QInterfaceRealization *> interfaceRealizations READ interfaceRealizations) - Q_PROPERTY(QBehavior * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior) + Q_PROPERTY(QSet<QtUml::QBehavior *> ownedBehaviors READ ownedBehaviors) + Q_PROPERTY(QSet<QtUml::QInterfaceRealization *> interfaceRealizations READ interfaceRealizations) + Q_PROPERTY(QtUml::QBehavior * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior) Q_DISABLE_COPY(QBehavioredClassifier) Q_DECLARE_PRIVATE(QBehavioredClassifier) @@ -98,7 +101,9 @@ protected: explicit QBehavioredClassifier(QBehavioredClassifierPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehavioredclassifier_p.h b/src/uml/qbehavioredclassifier_p.h index c6d9ae43..cd133f05 100644 --- a/src/uml/qbehavioredclassifier_p.h +++ b/src/uml/qbehavioredclassifier_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QBehavior *classifierBehavior; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehaviorexecutionspecification.cpp b/src/uml/qbehaviorexecutionspecification.cpp index 9d9b293c..74509f47 100644 --- a/src/uml/qbehaviorexecutionspecification.cpp +++ b/src/uml/qbehaviorexecutionspecification.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QBehaviorExecutionSpecificationPrivate::QBehaviorExecutionSpecificationPrivate() : behavior(0) @@ -108,17 +111,19 @@ void QBehaviorExecutionSpecification::setBehavior(QBehavior *behavior) void QBehaviorExecutionSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Behavior whose execution is occurring."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Behavior whose execution is occurring."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QExecutionSpecification::setPropertyData(); } -#include "moc_qbehaviorexecutionspecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qbehaviorexecutionspecification.cpp" diff --git a/src/uml/qbehaviorexecutionspecification.h b/src/uml/qbehaviorexecutionspecification.h index f4a467ee..763baf49 100644 --- a/src/uml/qbehaviorexecutionspecification.h +++ b/src/uml/qbehaviorexecutionspecification.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QBehaviorExecutionSpecification : public QExecutionSpecificat { Q_OBJECT - Q_PROPERTY(QBehavior * behavior READ behavior WRITE setBehavior) + Q_PROPERTY(QtUml::QBehavior * behavior READ behavior WRITE setBehavior) Q_DISABLE_COPY(QBehaviorExecutionSpecification) Q_DECLARE_PRIVATE(QBehaviorExecutionSpecification) @@ -80,7 +83,9 @@ protected: explicit QBehaviorExecutionSpecification(QBehaviorExecutionSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbehaviorexecutionspecification_p.h b/src/uml/qbehaviorexecutionspecification_p.h index 970a62ce..039f17bb 100644 --- a/src/uml/qbehaviorexecutionspecification_p.h +++ b/src/uml/qbehaviorexecutionspecification_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QBehavior *behavior; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbroadcastsignalaction.cpp b/src/uml/qbroadcastsignalaction.cpp index df07518c..1c57c130 100644 --- a/src/uml/qbroadcastsignalaction.cpp +++ b/src/uml/qbroadcastsignalaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QBroadcastSignalActionPrivate::QBroadcastSignalActionPrivate() : signal(0) @@ -108,17 +111,19 @@ void QBroadcastSignalAction::setSignal(QSignal *signal) void QBroadcastSignalAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of signal object transmitted to the target objects."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of signal object transmitted to the target objects."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInvocationAction::setPropertyData(); } -#include "moc_qbroadcastsignalaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qbroadcastsignalaction.cpp" diff --git a/src/uml/qbroadcastsignalaction.h b/src/uml/qbroadcastsignalaction.h index bde60fea..3efab443 100644 --- a/src/uml/qbroadcastsignalaction.h +++ b/src/uml/qbroadcastsignalaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QBroadcastSignalAction : public QInvocationAction { Q_OBJECT - Q_PROPERTY(QSignal * signal READ signal WRITE setSignal) + Q_PROPERTY(QtUml::QSignal * signal READ signal WRITE setSignal) Q_DISABLE_COPY(QBroadcastSignalAction) Q_DECLARE_PRIVATE(QBroadcastSignalAction) @@ -80,7 +83,9 @@ protected: explicit QBroadcastSignalAction(QBroadcastSignalActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qbroadcastsignalaction_p.h b/src/uml/qbroadcastsignalaction_p.h index eeeb047a..ee92c0f1 100644 --- a/src/uml/qbroadcastsignalaction_p.h +++ b/src/uml/qbroadcastsignalaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QSignal *signal; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcallaction.cpp b/src/uml/qcallaction.cpp index 307abccb..4c3bdfbf 100644 --- a/src/uml/qcallaction.cpp +++ b/src/uml/qcallaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCallActionPrivate::QCallActionPrivate() : isSynchronous(true) @@ -157,24 +160,26 @@ void QCallAction::removeResult(QOutputPin *result) void QCallAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the call is synchronous and the caller waits for completion of the invoked behavior. If false, the call is asynchronous and the caller proceeds immediately and does not expect a return values."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins where the results of performing the invocation are placed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the call is synchronous and the caller waits for completion of the invoked behavior. If false, the call is asynchronous and the caller proceeds immediately and does not expect a return values."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins where the results of performing the invocation are placed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallAction")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInvocationAction::setPropertyData(); } -#include "moc_qcallaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcallaction.cpp" diff --git a/src/uml/qcallaction.h b/src/uml/qcallaction.h index f8d52653..ad083f2d 100644 --- a/src/uml/qcallaction.h +++ b/src/uml/qcallaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,7 +68,7 @@ class Q_UML_EXPORT QCallAction : public QInvocationAction Q_OBJECT Q_PROPERTY(bool isSynchronous READ isSynchronous WRITE setSynchronous RESET unsetSynchronous) - Q_PROPERTY(QList<QOutputPin *> results READ results) + Q_PROPERTY(QList<QtUml::QOutputPin *> results READ results) Q_DISABLE_COPY(QCallAction) Q_DECLARE_PRIVATE(QCallAction) @@ -90,7 +93,9 @@ protected: explicit QCallAction(QCallActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcallaction_p.h b/src/uml/qcallaction_p.h index 7d284cce..96bff801 100644 --- a/src/uml/qcallaction_p.h +++ b/src/uml/qcallaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QList<QOutputPin *> results; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcallbehavioraction.cpp b/src/uml/qcallbehavioraction.cpp index 1fb4cd70..aee6a0a3 100644 --- a/src/uml/qcallbehavioraction.cpp +++ b/src/uml/qcallbehavioraction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCallBehaviorActionPrivate::QCallBehaviorActionPrivate() : behavior(0) @@ -108,17 +111,19 @@ void QCallBehaviorAction::setBehavior(QBehavior *behavior) void QCallBehaviorAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The invoked behavior. It must be capable of accepting and returning control."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The invoked behavior. It must be capable of accepting and returning control."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QCallAction::setPropertyData(); } -#include "moc_qcallbehavioraction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcallbehavioraction.cpp" diff --git a/src/uml/qcallbehavioraction.h b/src/uml/qcallbehavioraction.h index a74fb59f..8cf12407 100644 --- a/src/uml/qcallbehavioraction.h +++ b/src/uml/qcallbehavioraction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QCallBehaviorAction : public QCallAction { Q_OBJECT - Q_PROPERTY(QBehavior * behavior READ behavior WRITE setBehavior) + Q_PROPERTY(QtUml::QBehavior * behavior READ behavior WRITE setBehavior) Q_DISABLE_COPY(QCallBehaviorAction) Q_DECLARE_PRIVATE(QCallBehaviorAction) @@ -80,7 +83,9 @@ protected: explicit QCallBehaviorAction(QCallBehaviorActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcallbehavioraction_p.h b/src/uml/qcallbehavioraction_p.h index 736ae2ba..eb970203 100644 --- a/src/uml/qcallbehavioraction_p.h +++ b/src/uml/qcallbehavioraction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QBehavior *behavior; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcallevent.cpp b/src/uml/qcallevent.cpp index 82fdb4e5..c415e143 100644 --- a/src/uml/qcallevent.cpp +++ b/src/uml/qcallevent.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCallEventPrivate::QCallEventPrivate() : operation(0) @@ -108,17 +111,19 @@ void QCallEvent::setOperation(QOperation *operation) void QCallEvent::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the operation whose invocation raised the call event."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the operation whose invocation raised the call event."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QMessageEvent::setPropertyData(); } -#include "moc_qcallevent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcallevent.cpp" diff --git a/src/uml/qcallevent.h b/src/uml/qcallevent.h index a9beebbe..76a06709 100644 --- a/src/uml/qcallevent.h +++ b/src/uml/qcallevent.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QCallEvent : public QMessageEvent { Q_OBJECT - Q_PROPERTY(QOperation * operation READ operation WRITE setOperation) + Q_PROPERTY(QtUml::QOperation * operation READ operation WRITE setOperation) Q_DISABLE_COPY(QCallEvent) Q_DECLARE_PRIVATE(QCallEvent) @@ -80,7 +83,9 @@ protected: explicit QCallEvent(QCallEventPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcallevent_p.h b/src/uml/qcallevent_p.h index ce870d0f..e85899e7 100644 --- a/src/uml/qcallevent_p.h +++ b/src/uml/qcallevent_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOperation *operation; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcalloperationaction.cpp b/src/uml/qcalloperationaction.cpp index 7db2ed21..71415973 100644 --- a/src/uml/qcalloperationaction.cpp +++ b/src/uml/qcalloperationaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCallOperationActionPrivate::QCallOperationActionPrivate() : operation(0), @@ -139,24 +142,26 @@ void QCallOperationAction::setTarget(QInputPin *target) void QCallOperationAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operation to be invoked by the action execution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The target object to which the request is sent. The classifier of the target object is used to dynamically determine a behavior to invoke. This object constitutes the context of the execution of the operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operation to be invoked by the action execution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The target object to which the request is sent. The classifier of the target object is used to dynamically determine a behavior to invoke. This object constitutes the context of the execution of the operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCallOperationAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QCallAction::setPropertyData(); } -#include "moc_qcalloperationaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcalloperationaction.cpp" diff --git a/src/uml/qcalloperationaction.h b/src/uml/qcalloperationaction.h index f6d763f6..c425e961 100644 --- a/src/uml/qcalloperationaction.h +++ b/src/uml/qcalloperationaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QCallOperationAction : public QCallAction { Q_OBJECT - Q_PROPERTY(QOperation * operation READ operation WRITE setOperation) - Q_PROPERTY(QInputPin * target READ target WRITE setTarget) + Q_PROPERTY(QtUml::QOperation * operation READ operation WRITE setOperation) + Q_PROPERTY(QtUml::QInputPin * target READ target WRITE setTarget) Q_DISABLE_COPY(QCallOperationAction) Q_DECLARE_PRIVATE(QCallOperationAction) @@ -84,7 +87,9 @@ protected: explicit QCallOperationAction(QCallOperationActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcalloperationaction_p.h b/src/uml/qcalloperationaction_p.h index 5ea6c331..79fd66a1 100644 --- a/src/uml/qcalloperationaction_p.h +++ b/src/uml/qcalloperationaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QInputPin *target; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcentralbuffernode.cpp b/src/uml/qcentralbuffernode.cpp index 4ba67d0a..d7b5ece1 100644 --- a/src/uml/qcentralbuffernode.cpp +++ b/src/uml/qcentralbuffernode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCentralBufferNodePrivate::QCentralBufferNodePrivate() { @@ -83,7 +86,9 @@ void QCentralBufferNode::setPropertyData() QObjectNode::setPropertyData(); } -#include "moc_qcentralbuffernode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcentralbuffernode.cpp" diff --git a/src/uml/qcentralbuffernode.h b/src/uml/qcentralbuffernode.h index 7907e688..217394b0 100644 --- a/src/uml/qcentralbuffernode.h +++ b/src/uml/qcentralbuffernode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QCentralBufferNode(QCentralBufferNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcentralbuffernode_p.h b/src/uml/qcentralbuffernode_p.h index c2e21681..72e89f4e 100644 --- a/src/uml/qcentralbuffernode_p.h +++ b/src/uml/qcentralbuffernode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QCentralBufferNode; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qchangeevent.cpp b/src/uml/qchangeevent.cpp index 08179ec4..e9b1369a 100644 --- a/src/uml/qchangeevent.cpp +++ b/src/uml/qchangeevent.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QChangeEventPrivate::QChangeEventPrivate() : changeExpression(0) @@ -116,17 +119,19 @@ void QChangeEvent::setChangeExpression(QValueSpecification *changeExpression) void QChangeEvent::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A Boolean-valued expression that will result in a change event whenever its value changes from false to true."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A Boolean-valued expression that will result in a change event whenever its value changes from false to true."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QEvent::setPropertyData(); } -#include "moc_qchangeevent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qchangeevent.cpp" diff --git a/src/uml/qchangeevent.h b/src/uml/qchangeevent.h index ddbeb617..3e6a1b6b 100644 --- a/src/uml/qchangeevent.h +++ b/src/uml/qchangeevent.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QChangeEvent : public QEvent { Q_OBJECT - Q_PROPERTY(QValueSpecification * changeExpression READ changeExpression WRITE setChangeExpression) + Q_PROPERTY(QtUml::QValueSpecification * changeExpression READ changeExpression WRITE setChangeExpression) Q_DISABLE_COPY(QChangeEvent) Q_DECLARE_PRIVATE(QChangeEvent) @@ -80,7 +83,9 @@ protected: explicit QChangeEvent(QChangeEventPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qchangeevent_p.h b/src/uml/qchangeevent_p.h index f7689789..65129ec0 100644 --- a/src/uml/qchangeevent_p.h +++ b/src/uml/qchangeevent_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QValueSpecification *changeExpression; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclass.cpp b/src/uml/qclass.cpp index d9f4a880..f5e02341 100644 --- a/src/uml/qclass.cpp +++ b/src/uml/qclass.cpp @@ -53,7 +53,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QClassPrivate::QClassPrivate() : isAbstract(false), @@ -336,19 +339,19 @@ void QClass::setOwningTemplateParameter(QTemplateParameter *owningTemplateParame /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QClass::visibility() const +QtUmlNS::VisibilityKind QClass::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QClass::setVisibility(QtUml::VisibilityKind visibility) +void QClass::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QClass::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QClass); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -1064,66 +1067,68 @@ QSet<QNamedElement *> QClass::inherit(QSet<QNamedElement *> inhs) const void QClass::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships.True when a class is abstract."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::isAbstract"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines whether an object specified by this class is active or not. If true, then the owning class is referred to as an active class. If false, then such a class is referred to as a passive class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Classifiers that are defined (nested) within the Class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Receptions that objects of this class are willing to accept."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Extensions that specify additional properties of the metaclass. The property is derived from the extensions whose memberEnds are typed by the Class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExtension::metaclass"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operations owned by the class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::class"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes (i.e. the properties) owned by the class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredClassifier::ownedAttributes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::class"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This gives the superclasses of a class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::generals"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships.True when a class is abstract."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::isAbstract"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines whether an object specified by this class is active or not. If true, then the owning class is referred to as an active class. If false, then such a class is referred to as a passive class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("isActive")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Classifiers that are defined (nested) within the Class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Receptions that objects of this class are willing to accept."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Extensions that specify additional properties of the metaclass. The property is derived from the extensions whose memberEnds are typed by the Class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("extensions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExtension::metaclass"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operations owned by the class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::class"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes (i.e. the properties) owned by the class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredClassifier::ownedAttributes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::class"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This gives the superclasses of a class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QClassifier::generals"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClass")][QString::fromLatin1("superClasses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qclass.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qclass.cpp" diff --git a/src/uml/qclass.h b/src/uml/qclass.h index df0f0fb8..470ec68d 100644 --- a/src/uml/qclass.h +++ b/src/uml/qclass.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,68 +75,68 @@ class Q_UML_EXPORT QClass : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtUml::QPackage * package READ package WRITE setPackage) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(QSet<QUseCase *> ownedUseCases READ ownedUseCases) - Q_PROPERTY(QSet<QGeneralizationSet *> powertypeExtents READ powertypeExtents) - Q_PROPERTY(QSet<QUseCase *> useCases READ useCases) - Q_PROPERTY(QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QCollaborationUse *> collaborationUses READ collaborationUses) - Q_PROPERTY(QSet<QProperty *> attributes READ attributes) - Q_PROPERTY(QSet<QFeature *> features READ features) - Q_PROPERTY(QCollaborationUse * representation READ representation WRITE setRepresentation) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) - Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(QSet<QSubstitution *> substitutions READ substitutions) - - Q_PROPERTY(QSet<QConnectableElement *> roles READ roles) - Q_PROPERTY(QSet<QProperty *> parts READ parts STORED false) - Q_PROPERTY(QSet<QConnector *> ownedConnectors READ ownedConnectors) - - Q_PROPERTY(QSet<QPort *> ownedPorts READ ownedPorts STORED false) - - Q_PROPERTY(QSet<QBehavior *> ownedBehaviors READ ownedBehaviors) - Q_PROPERTY(QSet<QInterfaceRealization *> interfaceRealizations READ interfaceRealizations) - Q_PROPERTY(QBehavior * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior) + Q_PROPERTY(QSet<QtUml::QUseCase *> ownedUseCases READ ownedUseCases) + Q_PROPERTY(QSet<QtUml::QGeneralizationSet *> powertypeExtents READ powertypeExtents) + Q_PROPERTY(QSet<QtUml::QUseCase *> useCases READ useCases) + Q_PROPERTY(QtUml::QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QtUml::QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QCollaborationUse *> collaborationUses READ collaborationUses) + Q_PROPERTY(QSet<QtUml::QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QtUml::QFeature *> features READ features) + Q_PROPERTY(QtUml::QCollaborationUse * representation READ representation WRITE setRepresentation) + Q_PROPERTY(QSet<QtUml::QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QtUml::QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QSubstitution *> substitutions READ substitutions) + + Q_PROPERTY(QSet<QtUml::QConnectableElement *> roles READ roles) + Q_PROPERTY(QSet<QtUml::QProperty *> parts READ parts STORED false) + Q_PROPERTY(QSet<QtUml::QConnector *> ownedConnectors READ ownedConnectors) + + Q_PROPERTY(QSet<QtUml::QPort *> ownedPorts READ ownedPorts STORED false) + + Q_PROPERTY(QSet<QtUml::QBehavior *> ownedBehaviors READ ownedBehaviors) + Q_PROPERTY(QSet<QtUml::QInterfaceRealization *> interfaceRealizations READ interfaceRealizations) + Q_PROPERTY(QtUml::QBehavior * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isActive READ isActive WRITE setActive RESET unsetActive) - Q_PROPERTY(QList<QClassifier *> nestedClassifiers READ nestedClassifiers) - Q_PROPERTY(QSet<QReception *> ownedReceptions READ ownedReceptions) - Q_PROPERTY(QSet<QExtension *> extensions READ extensions STORED false) - Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) - Q_PROPERTY(QSet<QClass *> superClasses READ superClasses STORED false) + Q_PROPERTY(QList<QtUml::QClassifier *> nestedClassifiers READ nestedClassifiers) + Q_PROPERTY(QSet<QtUml::QReception *> ownedReceptions READ ownedReceptions) + Q_PROPERTY(QSet<QtUml::QExtension *> extensions READ extensions STORED false) + Q_PROPERTY(QList<QtUml::QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QtUml::QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QSet<QtUml::QClass *> superClasses READ superClasses STORED false) Q_DISABLE_COPY(QClass) Q_DECLARE_PRIVATE(QClass) @@ -181,8 +184,8 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QType @@ -302,7 +305,9 @@ private: QBehavioredClassifier *_wrappedBehavioredClassifier; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclass_p.h b/src/uml/qclass_p.h index 149c5cc5..1707fd32 100644 --- a/src/uml/qclass_p.h +++ b/src/uml/qclass_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -87,7 +90,9 @@ public: void removeExtension(QExtension *extension); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclassifier.cpp b/src/uml/qclassifier.cpp index 4c453b2b..f0709099 100644 --- a/src/uml/qclassifier.cpp +++ b/src/uml/qclassifier.cpp @@ -57,7 +57,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QClassifierPrivate::QClassifierPrivate() : isAbstract(false), @@ -373,19 +376,19 @@ void QClassifier::setOwningTemplateParameter(QTemplateParameter *owningTemplateP /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QClassifier::visibility() const +QtUmlNS::VisibilityKind QClassifier::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QClassifier::setVisibility(QtUml::VisibilityKind visibility) +void QClassifier::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QClassifier::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QClassifier); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -1070,117 +1073,117 @@ QSet<QClassifier *> QClassifier::parents() const void QClassifier::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier cannot be specialized by generalization. Note that this property is preserved through package merge operations; that is, the capability to specialize a Classifier (i.e., isFinalSpecialization =false) must be preserved in the resulting Classifier of a package merge operation where a Classifier with isFinalSpecialization =false is merged with a matching Classifier with isFinalSpecialization =true: the resulting Classifier will have isFinalSpecialization =false."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use cases owned by this classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the GeneralizationSet of which the associated Classifier is a power type."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralizationSet::powertype"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of use cases for which this Classifier is the subject."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::subject"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template parameter that exposes this element as a formal parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifierTemplateParameter::parameteredElement"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Classifiers that are redefined by this Classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional template signature specifying the formal template parameters."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateableElement::ownedTemplateSignature"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRedefinableTemplateSignature::classifier"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the collaboration uses owned by the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies each feature defined in the classifier.Note that there may be members of the Classifier that are of the type Feature but are not included in this association, e.g. inherited features."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QFeature::featuringClassifier"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a collaboration use which indicates the collaboration that represents this classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::collaborationUses"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralization::specific"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies all elements inherited by this classifier from the general classifiers."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the substitutions that are owned by this Classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QSubstitution::substitutingClassifier"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier does not provide a complete declaration and can typically not be instantiated. An abstract classifier is intended to be used by other classifiers e.g. as the target of general metarelationships or generalization relationships."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the Classifier cannot be specialized by generalization. Note that this property is preserved through package merge operations; that is, the capability to specialize a Classifier (i.e., isFinalSpecialization =false) must be preserved in the resulting Classifier of a package merge operation where a Classifier with isFinalSpecialization =false is merged with a matching Classifier with isFinalSpecialization =true: the resulting Classifier will have isFinalSpecialization =false."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("isFinalSpecialization")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use cases owned by this classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedUseCases")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the GeneralizationSet of which the associated Classifier is a power type."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("powertypeExtents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralizationSet::powertype"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of use cases for which this Classifier is the subject."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("useCases")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::subject"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template parameter that exposes this element as a formal parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifierTemplateParameter::parameteredElement"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Classifiers that are redefined by this Classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("redefinedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional template signature specifying the formal template parameters."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateableElement::ownedTemplateSignature"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRedefinableTemplateSignature::classifier"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the collaboration uses owned by the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("collaborationUses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to all of the Properties that are direct (i.e. not inherited or imported) attributes of the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("attributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies each feature defined in the classifier.Note that there may be members of the Classifier that are of the type Feature but are not included in this association, e.g. inherited features."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("features")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QFeature::featuringClassifier"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the general Classifiers for this Classifier.References the general classifier in the Generalization relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a collaboration use which indicates the collaboration that represents this classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::collaborationUses"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("representation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Generalization relationships for this Classifier. These Generalizations navigaten to more general classifiers in the generalization hierarchy."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("generalizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralization::specific"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies all elements inherited by this classifier from the general classifiers."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("inheritedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the substitutions that are owned by this Classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifier")][QString::fromLatin1("substitutions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QSubstitution::substitutingClassifier"); QWrappedObject::setPropertyData(); } @@ -1197,7 +1200,9 @@ void QClassifier::removeClientDependency(QWrappedObjectPointer<QSubstitution> su removeSubstitution(substitution); } -#include "moc_qclassifier.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qclassifier.cpp" diff --git a/src/uml/qclassifier.h b/src/uml/qclassifier.h index 17622447..8a466131 100644 --- a/src/uml/qclassifier.h +++ b/src/uml/qclassifier.h @@ -57,7 +57,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -79,51 +82,51 @@ class Q_UML_EXPORT QClassifier : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtUml::QPackage * package READ package WRITE setPackage) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(QSet<QUseCase *> ownedUseCases READ ownedUseCases) - Q_PROPERTY(QSet<QGeneralizationSet *> powertypeExtents READ powertypeExtents) - Q_PROPERTY(QSet<QUseCase *> useCases READ useCases) - Q_PROPERTY(QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QCollaborationUse *> collaborationUses READ collaborationUses) - Q_PROPERTY(QSet<QProperty *> attributes READ attributes) - Q_PROPERTY(QSet<QFeature *> features READ features) - Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) - Q_PROPERTY(QCollaborationUse * representation READ representation WRITE setRepresentation) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) - Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(QSet<QSubstitution *> substitutions READ substitutions) + Q_PROPERTY(QSet<QtUml::QUseCase *> ownedUseCases READ ownedUseCases) + Q_PROPERTY(QSet<QtUml::QGeneralizationSet *> powertypeExtents READ powertypeExtents) + Q_PROPERTY(QSet<QtUml::QUseCase *> useCases READ useCases) + Q_PROPERTY(QtUml::QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QtUml::QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QCollaborationUse *> collaborationUses READ collaborationUses) + Q_PROPERTY(QSet<QtUml::QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QtUml::QFeature *> features READ features) + Q_PROPERTY(QSet<QtUml::QClassifier *> generals READ generals STORED false) + Q_PROPERTY(QtUml::QCollaborationUse * representation READ representation WRITE setRepresentation) + Q_PROPERTY(QSet<QtUml::QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QtUml::QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QSubstitution *> substitutions READ substitutions) Q_DISABLE_COPY(QClassifier) Q_DECLARE_PRIVATE(QClassifier) @@ -171,8 +174,8 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QType @@ -266,7 +269,9 @@ private: QTemplateableElement *_wrappedTemplateableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclassifier_p.h b/src/uml/qclassifier_p.h index 1cf4babe..c8e2fa78 100644 --- a/src/uml/qclassifier_p.h +++ b/src/uml/qclassifier_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -102,7 +105,9 @@ public: void removeFeature(QFeature *feature); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclassifiertemplateparameter.cpp b/src/uml/qclassifiertemplateparameter.cpp index 82e93fd0..7e32c22b 100644 --- a/src/uml/qclassifiertemplateparameter.cpp +++ b/src/uml/qclassifiertemplateparameter.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QClassifierTemplateParameterPrivate::QClassifierTemplateParameterPrivate() : allowSubstitutable(true), @@ -181,31 +184,33 @@ void QClassifierTemplateParameter::removeConstrainingClassifier(QClassifier *con void QClassifierTemplateParameter::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constrains the required relationship between an actual parameter and the parameteredElement for this formal parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameterable classifier for this template parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::templateParameter"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifiers that constrain the argument that can be used for the parameter. If the allowSubstitutable attribute is true, then any classifier that is compatible with this constraining classifier can be substituted; otherwise, it must be either this classifier or one of its subclasses. If this property is empty, there are no constraints on the classifier that can be used as an argument."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constrains the required relationship between an actual parameter and the parameteredElement for this formal parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameterable classifier for this template parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::templateParameter"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifiers that constrain the argument that can be used for the parameter. If the allowSubstitutable attribute is true, then any classifier that is compatible with this constraining classifier can be substituted; otherwise, it must be either this classifier or one of its subclasses. If this property is empty, there are no constraints on the classifier that can be used as an argument."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClassifierTemplateParameter")][QString::fromLatin1("constrainingClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QTemplateParameter::setPropertyData(); } -#include "moc_qclassifiertemplateparameter.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qclassifiertemplateparameter.cpp" diff --git a/src/uml/qclassifiertemplateparameter.h b/src/uml/qclassifiertemplateparameter.h index db209e3e..c3c5c771 100644 --- a/src/uml/qclassifiertemplateparameter.h +++ b/src/uml/qclassifiertemplateparameter.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QClassifierTemplateParameter : public QTemplateParameter Q_OBJECT Q_PROPERTY(bool allowSubstitutable READ allowSubstitutable WRITE setAllowSubstitutable RESET unsetAllowSubstitutable) - Q_PROPERTY(QClassifier * parameteredElement READ parameteredElement WRITE setParameteredElement) - Q_PROPERTY(QSet<QClassifier *> constrainingClassifiers READ constrainingClassifiers) + Q_PROPERTY(QtUml::QClassifier * parameteredElement READ parameteredElement WRITE setParameteredElement) + Q_PROPERTY(QSet<QtUml::QClassifier *> constrainingClassifiers READ constrainingClassifiers) Q_DISABLE_COPY(QClassifierTemplateParameter) Q_DECLARE_PRIVATE(QClassifierTemplateParameter) @@ -93,7 +96,9 @@ protected: explicit QClassifierTemplateParameter(QClassifierTemplateParameterPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclassifiertemplateparameter_p.h b/src/uml/qclassifiertemplateparameter_p.h index 0304246e..f3d84323 100644 --- a/src/uml/qclassifiertemplateparameter_p.h +++ b/src/uml/qclassifiertemplateparameter_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QClassifier *> constrainingClassifiers; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclause.cpp b/src/uml/qclause.cpp index 169088ae..6182b2ad 100644 --- a/src/uml/qclause.cpp +++ b/src/uml/qclause.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QClausePrivate::QClausePrivate() : decider(0) @@ -278,52 +281,54 @@ void QClause::removeTest(QExecutableNode *test) void QClause::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of clauses which may not be tested unless the current clause tests false."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClause::predecessorClause"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("decider")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("decider")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("decider")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An output pin within the test fragment the value of which is examined after execution of the test to determine whether the body should be executed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("decider")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("decider")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("decider")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of clauses whose tests must all evaluate false before the current clause can be tested."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClause::successorClause"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins within the body fragment whose values are moved to the result pins of the containing conditional node after execution of the clause body."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A nested activity fragment that is executed if the test evaluates to true and the clause is chosen over any concurrent clauses that also evaluate to true."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("tests")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("tests")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("tests")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A nested activity fragment with a designated output pin that specifies the result of the test."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("tests")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("tests")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("tests")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of clauses which may not be tested unless the current clause tests false."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClause::predecessorClause"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("decider")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("decider")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("decider")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An output pin within the test fragment the value of which is examined after execution of the test to determine whether the body should be executed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("decider")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("decider")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("decider")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of clauses whose tests must all evaluate false before the current clause can be tested."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("predecessorClauses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClause::successorClause"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins within the body fragment whose values are moved to the result pins of the containing conditional node after execution of the clause body."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A nested activity fragment that is executed if the test evaluates to true and the clause is chosen over any concurrent clauses that also evaluate to true."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("tests")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("tests")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("tests")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A nested activity fragment with a designated output pin that specifies the result of the test."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("tests")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("tests")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClause")][QString::fromLatin1("tests")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qclause.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qclause.cpp" diff --git a/src/uml/qclause.h b/src/uml/qclause.h index 03dda1cd..1643c265 100644 --- a/src/uml/qclause.h +++ b/src/uml/qclause.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,12 +69,12 @@ class Q_UML_EXPORT QClause : public QElement { Q_OBJECT - Q_PROPERTY(QSet<QClause *> successorClauses READ successorClauses) - Q_PROPERTY(QOutputPin * decider READ decider WRITE setDecider) - Q_PROPERTY(QSet<QClause *> predecessorClauses READ predecessorClauses) - Q_PROPERTY(QList<QOutputPin *> bodyOutputs READ bodyOutputs) - Q_PROPERTY(QSet<QExecutableNode *> bodies READ bodies) - Q_PROPERTY(QSet<QExecutableNode *> tests READ tests) + Q_PROPERTY(QSet<QtUml::QClause *> successorClauses READ successorClauses) + Q_PROPERTY(QtUml::QOutputPin * decider READ decider WRITE setDecider) + Q_PROPERTY(QSet<QtUml::QClause *> predecessorClauses READ predecessorClauses) + Q_PROPERTY(QList<QtUml::QOutputPin *> bodyOutputs READ bodyOutputs) + Q_PROPERTY(QSet<QtUml::QExecutableNode *> bodies READ bodies) + Q_PROPERTY(QSet<QtUml::QExecutableNode *> tests READ tests) Q_DISABLE_COPY(QClause) Q_DECLARE_PRIVATE(QClause) @@ -105,7 +108,9 @@ protected: explicit QClause(QClausePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclause_p.h b/src/uml/qclause_p.h index 2ac2677d..c89e6ee7 100644 --- a/src/uml/qclause_p.h +++ b/src/uml/qclause_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ public: QSet<QExecutableNode *> tests; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclearassociationaction.cpp b/src/uml/qclearassociationaction.cpp index d56f701c..ea20c971 100644 --- a/src/uml/qclearassociationaction.cpp +++ b/src/uml/qclearassociationaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QClearAssociationActionPrivate::QClearAssociationActionPrivate() : object(0), @@ -139,24 +142,26 @@ void QClearAssociationAction::setAssociation(QAssociation *association) void QClearAssociationAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which is obtained the object whose participation in the association is to be cleared."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Association to be cleared."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which is obtained the object whose participation in the association is to be cleared."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Association to be cleared."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearAssociationAction")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qclearassociationaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qclearassociationaction.cpp" diff --git a/src/uml/qclearassociationaction.h b/src/uml/qclearassociationaction.h index a6eb53ad..47784334 100644 --- a/src/uml/qclearassociationaction.h +++ b/src/uml/qclearassociationaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QClearAssociationAction : public QAction { Q_OBJECT - Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(QAssociation * association READ association WRITE setAssociation) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QtUml::QAssociation * association READ association WRITE setAssociation) Q_DISABLE_COPY(QClearAssociationAction) Q_DECLARE_PRIVATE(QClearAssociationAction) @@ -84,7 +87,9 @@ protected: explicit QClearAssociationAction(QClearAssociationActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclearassociationaction_p.h b/src/uml/qclearassociationaction_p.h index 780e2687..fe5445bb 100644 --- a/src/uml/qclearassociationaction_p.h +++ b/src/uml/qclearassociationaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QAssociation *association; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclearstructuralfeatureaction.cpp b/src/uml/qclearstructuralfeatureaction.cpp index 2a77c3e8..d9556043 100644 --- a/src/uml/qclearstructuralfeatureaction.cpp +++ b/src/uml/qclearstructuralfeatureaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QClearStructuralFeatureActionPrivate::QClearStructuralFeatureActionPrivate() : result(0) @@ -116,17 +119,19 @@ void QClearStructuralFeatureAction::setResult(QOutputPin *result) void QClearStructuralFeatureAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QStructuralFeatureAction::setPropertyData(); } -#include "moc_qclearstructuralfeatureaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qclearstructuralfeatureaction.cpp" diff --git a/src/uml/qclearstructuralfeatureaction.h b/src/uml/qclearstructuralfeatureaction.h index 1b1072c0..747dfb89 100644 --- a/src/uml/qclearstructuralfeatureaction.h +++ b/src/uml/qclearstructuralfeatureaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QClearStructuralFeatureAction : public QStructuralFeatureActi { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QClearStructuralFeatureAction) Q_DECLARE_PRIVATE(QClearStructuralFeatureAction) @@ -80,7 +83,9 @@ protected: explicit QClearStructuralFeatureAction(QClearStructuralFeatureActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclearstructuralfeatureaction_p.h b/src/uml/qclearstructuralfeatureaction_p.h index e492f453..22abe259 100644 --- a/src/uml/qclearstructuralfeatureaction_p.h +++ b/src/uml/qclearstructuralfeatureaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclearvariableaction.cpp b/src/uml/qclearvariableaction.cpp index e697bcfd..6431af81 100644 --- a/src/uml/qclearvariableaction.cpp +++ b/src/uml/qclearvariableaction.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QClearVariableActionPrivate::QClearVariableActionPrivate() { @@ -83,7 +86,9 @@ void QClearVariableAction::setPropertyData() QVariableAction::setPropertyData(); } -#include "moc_qclearvariableaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qclearvariableaction.cpp" diff --git a/src/uml/qclearvariableaction.h b/src/uml/qclearvariableaction.h index 2d069b65..20445bf9 100644 --- a/src/uml/qclearvariableaction.h +++ b/src/uml/qclearvariableaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QClearVariableAction(QClearVariableActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qclearvariableaction_p.h b/src/uml/qclearvariableaction_p.h index 857488c3..ae418c39 100644 --- a/src/uml/qclearvariableaction_p.h +++ b/src/uml/qclearvariableaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QClearVariableAction; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcollaboration.cpp b/src/uml/qcollaboration.cpp index 550aad54..834ad60a 100644 --- a/src/uml/qcollaboration.cpp +++ b/src/uml/qcollaboration.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCollaborationPrivate::QCollaborationPrivate() { @@ -296,19 +299,19 @@ void QCollaboration::setOwningTemplateParameter(QTemplateParameter *owningTempla /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QCollaboration::visibility() const +QtUmlNS::VisibilityKind QCollaboration::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QCollaboration::setVisibility(QtUml::VisibilityKind visibility) +void QCollaboration::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QCollaboration::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QCollaboration); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -803,17 +806,19 @@ void QCollaboration::removeCollaborationRole(QConnectableElement *collaborationR void QCollaboration::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References connectable elements (possibly owned by other classifiers) which represent roles that instances may play in this collaboration."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QStructuredClassifier::roles"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References connectable elements (possibly owned by other classifiers) which represent roles that instances may play in this collaboration."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QStructuredClassifier::roles"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qcollaboration.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcollaboration.cpp" diff --git a/src/uml/qcollaboration.h b/src/uml/qcollaboration.h index b428056e..604e95fc 100644 --- a/src/uml/qcollaboration.h +++ b/src/uml/qcollaboration.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,62 +69,62 @@ class Q_UML_EXPORT QCollaboration : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtUml::QPackage * package READ package WRITE setPackage) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) Q_PROPERTY(bool isFinalSpecialization READ isFinalSpecialization WRITE setFinalSpecialization RESET unsetFinalSpecialization) - Q_PROPERTY(QSet<QUseCase *> ownedUseCases READ ownedUseCases) - Q_PROPERTY(QSet<QGeneralizationSet *> powertypeExtents READ powertypeExtents) - Q_PROPERTY(QSet<QUseCase *> useCases READ useCases) - Q_PROPERTY(QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QSet<QClassifier *> redefinedClassifiers READ redefinedClassifiers) - Q_PROPERTY(QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QCollaborationUse *> collaborationUses READ collaborationUses) - Q_PROPERTY(QSet<QProperty *> attributes READ attributes) - Q_PROPERTY(QSet<QFeature *> features READ features) - Q_PROPERTY(QSet<QClassifier *> generals READ generals STORED false) - Q_PROPERTY(QCollaborationUse * representation READ representation WRITE setRepresentation) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) - Q_PROPERTY(QSet<QNamedElement *> inheritedMembers READ inheritedMembers STORED false) - Q_PROPERTY(QSet<QSubstitution *> substitutions READ substitutions) - - Q_PROPERTY(QSet<QConnectableElement *> roles READ roles) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) - Q_PROPERTY(QSet<QProperty *> parts READ parts STORED false) - Q_PROPERTY(QSet<QConnector *> ownedConnectors READ ownedConnectors) - - Q_PROPERTY(QSet<QBehavior *> ownedBehaviors READ ownedBehaviors) - Q_PROPERTY(QSet<QInterfaceRealization *> interfaceRealizations READ interfaceRealizations) - Q_PROPERTY(QBehavior * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior) - - Q_PROPERTY(QSet<QConnectableElement *> collaborationRoles READ collaborationRoles) + Q_PROPERTY(QSet<QtUml::QUseCase *> ownedUseCases READ ownedUseCases) + Q_PROPERTY(QSet<QtUml::QGeneralizationSet *> powertypeExtents READ powertypeExtents) + Q_PROPERTY(QSet<QtUml::QUseCase *> useCases READ useCases) + Q_PROPERTY(QtUml::QClassifierTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinedClassifiers READ redefinedClassifiers) + Q_PROPERTY(QtUml::QRedefinableTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QCollaborationUse *> collaborationUses READ collaborationUses) + Q_PROPERTY(QSet<QtUml::QProperty *> attributes READ attributes) + Q_PROPERTY(QSet<QtUml::QFeature *> features READ features) + Q_PROPERTY(QSet<QtUml::QClassifier *> generals READ generals STORED false) + Q_PROPERTY(QtUml::QCollaborationUse * representation READ representation WRITE setRepresentation) + Q_PROPERTY(QSet<QtUml::QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QSet<QtUml::QNamedElement *> inheritedMembers READ inheritedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QSubstitution *> substitutions READ substitutions) + + Q_PROPERTY(QSet<QtUml::QConnectableElement *> roles READ roles) + Q_PROPERTY(QList<QtUml::QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QSet<QtUml::QProperty *> parts READ parts STORED false) + Q_PROPERTY(QSet<QtUml::QConnector *> ownedConnectors READ ownedConnectors) + + Q_PROPERTY(QSet<QtUml::QBehavior *> ownedBehaviors READ ownedBehaviors) + Q_PROPERTY(QSet<QtUml::QInterfaceRealization *> interfaceRealizations READ interfaceRealizations) + Q_PROPERTY(QtUml::QBehavior * classifierBehavior READ classifierBehavior WRITE setClassifierBehavior) + + Q_PROPERTY(QSet<QtUml::QConnectableElement *> collaborationRoles READ collaborationRoles) Q_DISABLE_COPY(QCollaboration) Q_DECLARE_PRIVATE(QCollaboration) @@ -169,8 +172,8 @@ public: Q_INVOKABLE void setOwningTemplateParameter(QTemplateParameter *owningTemplateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QType @@ -269,7 +272,9 @@ private: QBehavioredClassifier *_wrappedBehavioredClassifier; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcollaboration_p.h b/src/uml/qcollaboration_p.h index 6bce3412..1575c2ba 100644 --- a/src/uml/qcollaboration_p.h +++ b/src/uml/qcollaboration_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QConnectableElement *> collaborationRoles; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcollaborationuse.cpp b/src/uml/qcollaborationuse.cpp index 4bbc3d84..8e5e3f23 100644 --- a/src/uml/qcollaborationuse.cpp +++ b/src/uml/qcollaborationuse.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCollaborationUsePrivate::QCollaborationUsePrivate() : type(0) @@ -146,24 +149,26 @@ void QCollaborationUse::removeRoleBinding(QDependency *roleBinding) void QCollaborationUse::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The collaboration which is used in this occurrence. The collaboration defines the cooperation between its roles which are mapped to properties of the classifier owning the collaboration use."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A mapping between features of the collaboration type and features of the owning classifier. This mapping indicates which connectable element of the classifier plays which role(s) in the collaboration. A connectable element may be bound to multiple roles in the same collaboration use (that is, it may play multiple roles)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The collaboration which is used in this occurrence. The collaboration defines the cooperation between its roles which are mapped to properties of the classifier owning the collaboration use."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A mapping between features of the collaboration type and features of the owning classifier. This mapping indicates which connectable element of the classifier plays which role(s) in the collaboration. A connectable element may be bound to multiple roles in the same collaboration use (that is, it may play multiple roles)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCollaborationUse")][QString::fromLatin1("roleBindings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qcollaborationuse.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcollaborationuse.cpp" diff --git a/src/uml/qcollaborationuse.h b/src/uml/qcollaborationuse.h index 55565788..8aab4f66 100644 --- a/src/uml/qcollaborationuse.h +++ b/src/uml/qcollaborationuse.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QCollaborationUse : public QNamedElement { Q_OBJECT - Q_PROPERTY(QCollaboration * type READ type WRITE setType) - Q_PROPERTY(QSet<QDependency *> roleBindings READ roleBindings) + Q_PROPERTY(QtUml::QCollaboration * type READ type WRITE setType) + Q_PROPERTY(QSet<QtUml::QDependency *> roleBindings READ roleBindings) Q_DISABLE_COPY(QCollaborationUse) Q_DECLARE_PRIVATE(QCollaborationUse) @@ -88,7 +91,9 @@ protected: explicit QCollaborationUse(QCollaborationUsePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcollaborationuse_p.h b/src/uml/qcollaborationuse_p.h index 76bd34d6..a626dc76 100644 --- a/src/uml/qcollaborationuse_p.h +++ b/src/uml/qcollaborationuse_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QDependency *> roleBindings; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcombinedfragment.cpp b/src/uml/qcombinedfragment.cpp index 0ccd9db7..a260bbe7 100644 --- a/src/uml/qcombinedfragment.cpp +++ b/src/uml/qcombinedfragment.cpp @@ -47,10 +47,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCombinedFragmentPrivate::QCombinedFragmentPrivate() : - interactionOperator(QtUml::InteractionOperatorSeq) + interactionOperator(QtUmlNS::InteractionOperatorSeq) { } @@ -89,7 +92,7 @@ QCombinedFragment::~QCombinedFragment() /*! Specifies the operation which defines the semantics of this combination of InteractionFragments. */ -QtUml::InteractionOperatorKind QCombinedFragment::interactionOperator() const +QtUmlNS::InteractionOperatorKind QCombinedFragment::interactionOperator() const { // This is a read-write attribute @@ -97,7 +100,7 @@ QtUml::InteractionOperatorKind QCombinedFragment::interactionOperator() const return d->interactionOperator; } -void QCombinedFragment::setInteractionOperator(QtUml::InteractionOperatorKind interactionOperator) +void QCombinedFragment::setInteractionOperator(QtUmlNS::InteractionOperatorKind interactionOperator) { // This is a read-write attribute @@ -110,7 +113,7 @@ void QCombinedFragment::setInteractionOperator(QtUml::InteractionOperatorKind in void QCombinedFragment::unsetInteractionOperator() { - setInteractionOperator(QtUml::InteractionOperatorSeq); + setInteractionOperator(QtUmlNS::InteractionOperatorSeq); Q_D(QCombinedFragment); d->modifiedResettableProperties.removeAll(QString::fromLatin1("interactionOperator")); } @@ -195,31 +198,33 @@ void QCombinedFragment::removeOperand(QInteractionOperand *operand) void QCombinedFragment::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the operation which defines the semantics of this combination of InteractionFragments."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the gates that form the interface between this CombinedFragment and its surroundings"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of operands of the combined fragment."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the operation which defines the semantics of this combination of InteractionFragments."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the gates that form the interface between this CombinedFragment and its surroundings"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("cfragmentGates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of operands of the combined fragment."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCombinedFragment")][QString::fromLatin1("operands")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInteractionFragment::setPropertyData(); } -#include "moc_qcombinedfragment.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcombinedfragment.cpp" diff --git a/src/uml/qcombinedfragment.h b/src/uml/qcombinedfragment.h index c7f9189c..f58f226e 100644 --- a/src/uml/qcombinedfragment.h +++ b/src/uml/qcombinedfragment.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,9 +72,9 @@ class Q_UML_EXPORT QCombinedFragment : public QInteractionFragment { Q_OBJECT - Q_PROPERTY(QtUml::InteractionOperatorKind interactionOperator READ interactionOperator WRITE setInteractionOperator RESET unsetInteractionOperator) - Q_PROPERTY(QSet<QGate *> cfragmentGates READ cfragmentGates) - Q_PROPERTY(QList<QInteractionOperand *> operands READ operands) + Q_PROPERTY(QtUmlNS::InteractionOperatorKind interactionOperator READ interactionOperator WRITE setInteractionOperator RESET unsetInteractionOperator) + Q_PROPERTY(QSet<QtUml::QGate *> cfragmentGates READ cfragmentGates) + Q_PROPERTY(QList<QtUml::QInteractionOperand *> operands READ operands) Q_DISABLE_COPY(QCombinedFragment) Q_DECLARE_PRIVATE(QCombinedFragment) @@ -81,8 +84,8 @@ public: virtual ~QCombinedFragment(); // Attributes from QCombinedFragment - Q_INVOKABLE QtUml::InteractionOperatorKind interactionOperator() const; - Q_INVOKABLE void setInteractionOperator(QtUml::InteractionOperatorKind interactionOperator); + Q_INVOKABLE QtUmlNS::InteractionOperatorKind interactionOperator() const; + Q_INVOKABLE void setInteractionOperator(QtUmlNS::InteractionOperatorKind interactionOperator); Q_INVOKABLE void unsetInteractionOperator(); // Association ends from QCombinedFragment @@ -99,7 +102,9 @@ protected: explicit QCombinedFragment(QCombinedFragmentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcombinedfragment_p.h b/src/uml/qcombinedfragment_p.h index 32d44c76..d68ba82e 100644 --- a/src/uml/qcombinedfragment_p.h +++ b/src/uml/qcombinedfragment_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,12 +75,14 @@ public: explicit QCombinedFragmentPrivate(); virtual ~QCombinedFragmentPrivate(); - QtUml::InteractionOperatorKind interactionOperator; + QtUmlNS::InteractionOperatorKind interactionOperator; QSet<QGate *> cfragmentGates; QList<QInteractionOperand *> operands; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcomment.cpp b/src/uml/qcomment.cpp index 7557c8e1..d5886c74 100644 --- a/src/uml/qcomment.cpp +++ b/src/uml/qcomment.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCommentPrivate::QCommentPrivate() { @@ -140,24 +143,26 @@ void QComment::removeAnnotatedElement(QElement *annotatedElement) void QComment::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a string that is the comment."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Element(s) being commented."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("body")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("body")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("body")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a string that is the comment."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("body")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("body")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("body")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Element(s) being commented."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComment")][QString::fromLatin1("annotatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qcomment.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcomment.cpp" diff --git a/src/uml/qcomment.h b/src/uml/qcomment.h index c219766b..41cb4b09 100644 --- a/src/uml/qcomment.h +++ b/src/uml/qcomment.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,7 +66,7 @@ class Q_UML_EXPORT QComment : public QElement Q_OBJECT Q_PROPERTY(QString body READ body WRITE setBody) - Q_PROPERTY(QSet<QElement *> annotatedElements READ annotatedElements) + Q_PROPERTY(QSet<QtUml::QElement *> annotatedElements READ annotatedElements) Q_DISABLE_COPY(QComment) Q_DECLARE_PRIVATE(QComment) @@ -87,7 +90,9 @@ protected: explicit QComment(QCommentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcomment_p.h b/src/uml/qcomment_p.h index 6ea08f3b..dad07b0b 100644 --- a/src/uml/qcomment_p.h +++ b/src/uml/qcomment_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QComment; @@ -69,7 +72,9 @@ public: QSet<QElement *> annotatedElements; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcommunicationpath.cpp b/src/uml/qcommunicationpath.cpp index 624c9f44..1e9e31e7 100644 --- a/src/uml/qcommunicationpath.cpp +++ b/src/uml/qcommunicationpath.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCommunicationPathPrivate::QCommunicationPathPrivate() { @@ -83,7 +86,9 @@ void QCommunicationPath::setPropertyData() QAssociation::setPropertyData(); } -#include "moc_qcommunicationpath.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcommunicationpath.cpp" diff --git a/src/uml/qcommunicationpath.h b/src/uml/qcommunicationpath.h index 4541d7b8..6ff72d22 100644 --- a/src/uml/qcommunicationpath.h +++ b/src/uml/qcommunicationpath.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QCommunicationPath(QCommunicationPathPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcommunicationpath_p.h b/src/uml/qcommunicationpath_p.h index 40776099..d7f14155 100644 --- a/src/uml/qcommunicationpath_p.h +++ b/src/uml/qcommunicationpath_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QCommunicationPath; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcomponent.cpp b/src/uml/qcomponent.cpp index 1fea966a..37baf0f5 100644 --- a/src/uml/qcomponent.cpp +++ b/src/uml/qcomponent.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QComponentPrivate::QComponentPrivate() : isIndirectlyInstantiated(true) @@ -249,45 +252,47 @@ QSet<QInterface *> QComponent::usedInterfaces(const QClassifier *classifier) con void QComponent::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("isIndirectlyInstantiated : Boolean {default = true} The kind of instantiation that applies to a Component. If false, the component is instantiated as an addressable object. If true, the Component is defined at design-time, but at run-time (or execution-time) an object specified by the Component does not exist, that is, the component is instantiated indirectly, through the instantiation of its realizing classifiers or parts. Several standard stereotypes use this meta attribute (e.g., «specification», «focus», «subsystem»)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of Realizations owned by the Component. Realizations reference the Classifiers of which the Component is an abstraction; i.e., that realize its behavior."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QComponentRealization::abstraction"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("required")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("required")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("required")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The interfaces that the component requires from other components in its environment in order to be able to offer its full set of provided functionality. These interfaces may be used by the Component or any of its realizingClassifiers, or they may be the Interfaces that are required by its public Ports."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("required")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("required")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("required")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The interfaces that the component exposes to its environment. These interfaces may be Realized by the Component or any of its realizingClassifiers, or they may be the Interfaces that are provided by its public Ports."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of PackageableElements that a Component owns. In the namespace of a component, all model elements that are involved in or related to its definition may be owned or imported explicitly. These may include e.g. Classes, Interfaces, Components, Packages, Use cases, Dependencies (e.g. mappings), and Artifacts."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("isIndirectlyInstantiated : Boolean {default = true} The kind of instantiation that applies to a Component. If false, the component is instantiated as an addressable object. If true, the Component is defined at design-time, but at run-time (or execution-time) an object specified by the Component does not exist, that is, the component is instantiated indirectly, through the instantiation of its realizing classifiers or parts. Several standard stereotypes use this meta attribute (e.g., «specification», «focus», «subsystem»)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of Realizations owned by the Component. Realizations reference the Classifiers of which the Component is an abstraction; i.e., that realize its behavior."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("realizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QComponentRealization::abstraction"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("required")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("required")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("required")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The interfaces that the component requires from other components in its environment in order to be able to offer its full set of provided functionality. These interfaces may be used by the Component or any of its realizingClassifiers, or they may be the Interfaces that are required by its public Ports."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("required")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("required")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("required")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The interfaces that the component exposes to its environment. These interfaces may be Realized by the Component or any of its realizingClassifiers, or they may be the Interfaces that are provided by its public Ports."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("provided")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of PackageableElements that a Component owns. In the namespace of a component, all model elements that are involved in or related to its definition may be owned or imported explicitly. These may include e.g. Classes, Interfaces, Components, Packages, Use cases, Dependencies (e.g. mappings), and Artifacts."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponent")][QString::fromLatin1("packagedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClass::setPropertyData(); } -#include "moc_qcomponent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcomponent.cpp" diff --git a/src/uml/qcomponent.h b/src/uml/qcomponent.h index ad04f237..7b94730f 100644 --- a/src/uml/qcomponent.h +++ b/src/uml/qcomponent.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,10 +71,10 @@ class Q_UML_EXPORT QComponent : public QClass Q_OBJECT Q_PROPERTY(bool isIndirectlyInstantiated READ isIndirectlyInstantiated WRITE setIndirectlyInstantiated RESET unsetIndirectlyInstantiated) - Q_PROPERTY(QSet<QComponentRealization *> realizations READ realizations) - Q_PROPERTY(QSet<QInterface *> required READ required STORED false) - Q_PROPERTY(QSet<QInterface *> provided READ provided STORED false) - Q_PROPERTY(QSet<QPackageableElement *> packagedElements READ packagedElements) + Q_PROPERTY(QSet<QtUml::QComponentRealization *> realizations READ realizations) + Q_PROPERTY(QSet<QtUml::QInterface *> required READ required STORED false) + Q_PROPERTY(QSet<QtUml::QInterface *> provided READ provided STORED false) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> packagedElements READ packagedElements) Q_DISABLE_COPY(QComponent) Q_DECLARE_PRIVATE(QComponent) @@ -105,7 +108,9 @@ protected: explicit QComponent(QComponentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcomponent_p.h b/src/uml/qcomponent_p.h index 5225ebbb..6548b005 100644 --- a/src/uml/qcomponent_p.h +++ b/src/uml/qcomponent_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,7 +78,9 @@ public: QSet<QPackageableElement *> packagedElements; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcomponentrealization.cpp b/src/uml/qcomponentrealization.cpp index 1ad22593..523b1d1d 100644 --- a/src/uml/qcomponentrealization.cpp +++ b/src/uml/qcomponentrealization.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QComponentRealizationPrivate::QComponentRealizationPrivate() : abstraction(0) @@ -163,19 +166,19 @@ void QComponentRealization::removeRealizingClassifier(QClassifier *realizingClas void QComponentRealization::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Component that owns this ComponentRealization and which is implemented by its realizing classifiers."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QComponent::realization"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifiers that are involved in the implementation of the Component that owns this Realization."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::clients"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Component that owns this ComponentRealization and which is implemented by its realizing classifiers."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QComponent::realization"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifiers that are involved in the implementation of the Component that owns this Realization."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::clients"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QComponentRealization")][QString::fromLatin1("realizingClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QRealization::setPropertyData(); } @@ -203,7 +206,9 @@ void QComponentRealization::removeClient(QWrappedObjectPointer<QClassifier> real removeRealizingClassifier(realizingClassifier); } -#include "moc_qcomponentrealization.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcomponentrealization.cpp" diff --git a/src/uml/qcomponentrealization.h b/src/uml/qcomponentrealization.h index d601185d..13c38acb 100644 --- a/src/uml/qcomponentrealization.h +++ b/src/uml/qcomponentrealization.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,8 +70,8 @@ class Q_UML_EXPORT QComponentRealization : public QRealization { Q_OBJECT - Q_PROPERTY(QComponent * abstraction READ abstraction WRITE setAbstraction) - Q_PROPERTY(QSet<QClassifier *> realizingClassifiers READ realizingClassifiers) + Q_PROPERTY(QtUml::QComponent * abstraction READ abstraction WRITE setAbstraction) + Q_PROPERTY(QSet<QtUml::QClassifier *> realizingClassifiers READ realizingClassifiers) Q_DISABLE_COPY(QComponentRealization) Q_DECLARE_PRIVATE(QComponentRealization) @@ -96,7 +99,9 @@ protected: explicit QComponentRealization(QComponentRealizationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcomponentrealization_p.h b/src/uml/qcomponentrealization_p.h index e1749610..68c83ede 100644 --- a/src/uml/qcomponentrealization_p.h +++ b/src/uml/qcomponentrealization_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QClassifier *> realizingClassifiers; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconditionalnode.cpp b/src/uml/qconditionalnode.cpp index a6c0638f..d9c57944 100644 --- a/src/uml/qconditionalnode.cpp +++ b/src/uml/qconditionalnode.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConditionalNodePrivate::QConditionalNodePrivate() : isAssured(false), @@ -227,38 +230,40 @@ void QConditionalNode::removeResult(QOutputPin *result) void QConditionalNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the modeler asserts that at least one test will succeed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the modeler asserts that at most one test will succeed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Set of clauses composing the conditional."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins that constitute the data flow outputs of the conditional."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::structuredNodeOutputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the modeler asserts that at least one test will succeed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the modeler asserts that at most one test will succeed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("isDeterminate")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Set of clauses composing the conditional."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("clauses")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins that constitute the data flow outputs of the conditional."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::structuredNodeOutputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConditionalNode")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QStructuredActivityNode::setPropertyData(); } -#include "moc_qconditionalnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconditionalnode.cpp" diff --git a/src/uml/qconditionalnode.h b/src/uml/qconditionalnode.h index 3adba277..022de00e 100644 --- a/src/uml/qconditionalnode.h +++ b/src/uml/qconditionalnode.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,8 +71,8 @@ class Q_UML_EXPORT QConditionalNode : public QStructuredActivityNode Q_PROPERTY(bool isAssured READ isAssured WRITE setAssured RESET unsetAssured) Q_PROPERTY(bool isDeterminate READ isDeterminate WRITE setDeterminate RESET unsetDeterminate) - Q_PROPERTY(QSet<QClause *> clauses READ clauses) - Q_PROPERTY(QList<QOutputPin *> results READ results) + Q_PROPERTY(QSet<QtUml::QClause *> clauses READ clauses) + Q_PROPERTY(QList<QtUml::QOutputPin *> results READ results) Q_DISABLE_COPY(QConditionalNode) Q_DECLARE_PRIVATE(QConditionalNode) @@ -100,7 +103,9 @@ protected: explicit QConditionalNode(QConditionalNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconditionalnode_p.h b/src/uml/qconditionalnode_p.h index 49fd47da..aca02944 100644 --- a/src/uml/qconditionalnode_p.h +++ b/src/uml/qconditionalnode_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,7 +78,9 @@ public: QList<QOutputPin *> results; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectableelement.cpp b/src/uml/qconnectableelement.cpp index 066b2009..5307d3aa 100644 --- a/src/uml/qconnectableelement.cpp +++ b/src/uml/qconnectableelement.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConnectableElementPrivate::QConnectableElementPrivate() : templateParameter(0) @@ -175,12 +178,12 @@ void QConnectableElement::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QConnectableElement::visibility() const +QtUmlNS::VisibilityKind QConnectableElement::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QConnectableElement::setVisibility(QtUml::VisibilityKind visibility) +void QConnectableElement::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -317,24 +320,26 @@ void QConnectableElement::setTemplateParameter(QConnectableElementTemplateParame void QConnectableElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Denotes a set of connector ends that attaches to this connectable element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectorEnd::role"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ConnectableElementTemplateParameter for this ConnectableElement parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectableElementTemplateParameter::parameteredElement"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Denotes a set of connector ends that attaches to this connectable element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectorEnd::role"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ConnectableElementTemplateParameter for this ConnectableElement parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectableElementTemplateParameter::parameteredElement"); QWrappedObject::setPropertyData(); } -#include "moc_qconnectableelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconnectableelement.cpp" diff --git a/src/uml/qconnectableelement.h b/src/uml/qconnectableelement.h index b56cb65a..942cc31c 100644 --- a/src/uml/qconnectableelement.h +++ b/src/uml/qconnectableelement.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,23 +70,23 @@ class Q_UML_EXPORT QConnectableElement : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QList<QConnectorEnd *> ends READ ends STORED false) - Q_PROPERTY(QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QList<QtUml::QConnectorEnd *> ends READ ends STORED false) + Q_PROPERTY(QtUml::QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) Q_DISABLE_COPY(QConnectableElement) Q_DECLARE_PRIVATE(QConnectableElement) @@ -102,8 +105,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -140,7 +143,9 @@ private: QParameterableElement *_wrappedParameterableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectableelement_p.h b/src/uml/qconnectableelement_p.h index b0204d33..2a7cbe4f 100644 --- a/src/uml/qconnectableelement_p.h +++ b/src/uml/qconnectableelement_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -76,7 +79,9 @@ public: void removeEnd(QConnectorEnd *end); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectableelementtemplateparameter.cpp b/src/uml/qconnectableelementtemplateparameter.cpp index b2526fc6..ce2f9b3f 100644 --- a/src/uml/qconnectableelementtemplateparameter.cpp +++ b/src/uml/qconnectableelementtemplateparameter.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConnectableElementTemplateParameterPrivate::QConnectableElementTemplateParameterPrivate() : parameteredElement(0) @@ -116,17 +119,19 @@ void QConnectableElementTemplateParameter::setParameteredElement(QConnectableEle void QConnectableElementTemplateParameter::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ConnectableElement for this template parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectableElement::templateParameter"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ConnectableElement for this template parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectableElement::templateParameter"); QTemplateParameter::setPropertyData(); } -#include "moc_qconnectableelementtemplateparameter.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconnectableelementtemplateparameter.cpp" diff --git a/src/uml/qconnectableelementtemplateparameter.h b/src/uml/qconnectableelementtemplateparameter.h index 215488fe..bb8111e8 100644 --- a/src/uml/qconnectableelementtemplateparameter.h +++ b/src/uml/qconnectableelementtemplateparameter.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QConnectableElementTemplateParameter : public QTemplateParame { Q_OBJECT - Q_PROPERTY(QConnectableElement * parameteredElement READ parameteredElement WRITE setParameteredElement) + Q_PROPERTY(QtUml::QConnectableElement * parameteredElement READ parameteredElement WRITE setParameteredElement) Q_DISABLE_COPY(QConnectableElementTemplateParameter) Q_DECLARE_PRIVATE(QConnectableElementTemplateParameter) @@ -80,7 +83,9 @@ protected: explicit QConnectableElementTemplateParameter(QConnectableElementTemplateParameterPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectableelementtemplateparameter_p.h b/src/uml/qconnectableelementtemplateparameter_p.h index 7f8138af..1b18661b 100644 --- a/src/uml/qconnectableelementtemplateparameter_p.h +++ b/src/uml/qconnectableelementtemplateparameter_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QConnectableElement *parameteredElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectionpointreference.cpp b/src/uml/qconnectionpointreference.cpp index 5af1adb2..99fc408b 100644 --- a/src/uml/qconnectionpointreference.cpp +++ b/src/uml/qconnectionpointreference.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConnectionPointReferencePrivate::QConnectionPointReferencePrivate() : state(0) @@ -182,31 +185,33 @@ void QConnectionPointReference::removeEntry(QPseudostate *entry) void QConnectionPointReference::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The exitPoints kind pseudo states corresponding to this connection point."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The State in which the connection point refreshens are defined."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::connection"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The entryPoint kind pseudo states corresponding to this connection point."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The exitPoints kind pseudo states corresponding to this connection point."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The State in which the connection point refreshens are defined."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("state")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::connection"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The entryPoint kind pseudo states corresponding to this connection point."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectionPointReference")][QString::fromLatin1("entries")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QVertex::setPropertyData(); } -#include "moc_qconnectionpointreference.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconnectionpointreference.cpp" diff --git a/src/uml/qconnectionpointreference.h b/src/uml/qconnectionpointreference.h index 7d060142..753ca900 100644 --- a/src/uml/qconnectionpointreference.h +++ b/src/uml/qconnectionpointreference.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,9 +68,9 @@ class Q_UML_EXPORT QConnectionPointReference : public QVertex { Q_OBJECT - Q_PROPERTY(QSet<QPseudostate *> exits READ exits) - Q_PROPERTY(QState * state READ state WRITE setState) - Q_PROPERTY(QSet<QPseudostate *> entries READ entries) + Q_PROPERTY(QSet<QtUml::QPseudostate *> exits READ exits) + Q_PROPERTY(QtUml::QState * state READ state WRITE setState) + Q_PROPERTY(QSet<QtUml::QPseudostate *> entries READ entries) Q_DISABLE_COPY(QConnectionPointReference) Q_DECLARE_PRIVATE(QConnectionPointReference) @@ -92,7 +95,9 @@ protected: explicit QConnectionPointReference(QConnectionPointReferencePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectionpointreference_p.h b/src/uml/qconnectionpointreference_p.h index 1f7cb4fd..474643ce 100644 --- a/src/uml/qconnectionpointreference_p.h +++ b/src/uml/qconnectionpointreference_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QSet<QPseudostate *> entries; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnector.cpp b/src/uml/qconnector.cpp index 16583e07..53effe2e 100644 --- a/src/uml/qconnector.cpp +++ b/src/uml/qconnector.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConnectorPrivate::QConnectorPrivate() : type(0) @@ -90,13 +93,13 @@ QConnector::~QConnector() /*! Indicates the kind of connector. This is derived: a connector with one or more ends connected to a Port which is not on a Part and which is not a behavior port is a delegation; otherwise it is an assembly. */ -QtUml::ConnectorKind QConnector::kind() const +QtUmlNS::ConnectorKind QConnector::kind() const { // This is a read-only derived attribute qWarning("QConnector::kind: to be implemented (this is a derived attribute)"); - return QtUml::ConnectorKind(); // change here to your derived return + return QtUmlNS::ConnectorKind(); // change here to your derived return } // --------------------------------------------------------------- @@ -231,45 +234,47 @@ void QConnector::removeEnd(QConnectorEnd *end) void QConnector::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the kind of connector. This is derived: a connector with one or more ends connected to a Port which is not on a Part and which is not a behavior port is a delegation; otherwise it is an assembly."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A connector may be redefined when its containing classifier is specialized. The redefining connector may have a type that specializes the type of the redefined connector. The types of the connector ends of the redefining connector may specialize the types of the connector ends of the redefined connector. The properties of the connector ends of the redefining connector may be replaced."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of Behaviors that specify the valid interaction patterns across the connector."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional association that specifies the link corresponding to this connector."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A connector consists of at least two connector ends, each representing the participation of instances of the classifiers typing the connectable elements attached to this end. The set of connector ends is ordered."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the kind of connector. This is derived: a connector with one or more ends connected to a Port which is not on a Part and which is not a behavior port is a delegation; otherwise it is an assembly."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A connector may be redefined when its containing classifier is specialized. The redefining connector may have a type that specializes the type of the redefined connector. The types of the connector ends of the redefining connector may specialize the types of the connector ends of the redefined connector. The properties of the connector ends of the redefining connector may be replaced."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("redefinedConnectors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of Behaviors that specify the valid interaction patterns across the connector."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("contracts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional association that specifies the link corresponding to this connector."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A connector consists of at least two connector ends, each representing the participation of instances of the classifiers typing the connectable elements attached to this end. The set of connector ends is ordered."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnector")][QString::fromLatin1("ends")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QFeature::setPropertyData(); } -#include "moc_qconnector.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconnector.cpp" diff --git a/src/uml/qconnector.h b/src/uml/qconnector.h index c73960a0..6951a23f 100644 --- a/src/uml/qconnector.h +++ b/src/uml/qconnector.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,11 +73,11 @@ class Q_UML_EXPORT QConnector : public QFeature { Q_OBJECT - Q_PROPERTY(QtUml::ConnectorKind kind READ kind STORED false) - Q_PROPERTY(QSet<QConnector *> redefinedConnectors READ redefinedConnectors) - Q_PROPERTY(QSet<QBehavior *> contracts READ contracts) - Q_PROPERTY(QAssociation * type READ type WRITE setType) - Q_PROPERTY(QList<QConnectorEnd *> ends READ ends) + Q_PROPERTY(QtUmlNS::ConnectorKind kind READ kind STORED false) + Q_PROPERTY(QSet<QtUml::QConnector *> redefinedConnectors READ redefinedConnectors) + Q_PROPERTY(QSet<QtUml::QBehavior *> contracts READ contracts) + Q_PROPERTY(QtUml::QAssociation * type READ type WRITE setType) + Q_PROPERTY(QList<QtUml::QConnectorEnd *> ends READ ends) Q_DISABLE_COPY(QConnector) Q_DECLARE_PRIVATE(QConnector) @@ -84,7 +87,7 @@ public: virtual ~QConnector(); // Attributes from QConnector - Q_INVOKABLE QtUml::ConnectorKind kind() const; + Q_INVOKABLE QtUmlNS::ConnectorKind kind() const; // Association ends from QConnector Q_INVOKABLE QSet<QConnector *> redefinedConnectors() const; @@ -105,7 +108,9 @@ protected: explicit QConnector(QConnectorPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnector_p.h b/src/uml/qconnector_p.h index d7a31888..220a3d2d 100644 --- a/src/uml/qconnector_p.h +++ b/src/uml/qconnector_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -79,7 +82,9 @@ public: QList<QConnectorEnd *> ends; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectorend.cpp b/src/uml/qconnectorend.cpp index 0b6a15cf..f5fece67 100644 --- a/src/uml/qconnectorend.cpp +++ b/src/uml/qconnectorend.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConnectorEndPrivate::QConnectorEndPrivate() : role(0), @@ -153,31 +156,33 @@ QProperty *QConnectorEnd::definingEnd() const void QConnectorEnd::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The connectable element attached at this connector end. When an instance of the containing classifier is created, a link may (depending on the multiplicities) be created to an instance of the classifier that types this connectable element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectableElement::end"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the role of the internal structure of a classifier with the port to which the connector end is attached."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A derived association referencing the corresponding association end on the association which types the connector owing this connector end. This association is derived by selecting the association end at the same place in the ordering of association ends as this connector end."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The connectable element attached at this connector end. When an instance of the containing classifier is created, a link may (depending on the multiplicities) be created to an instance of the classifier that types this connectable element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectableElement::end"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the role of the internal structure of a classifier with the port to which the connector end is attached."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("partWithPort")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A derived association referencing the corresponding association end on the association which types the connector owing this connector end. This association is derived by selecting the association end at the same place in the ordering of association ends as this connector end."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConnectorEnd")][QString::fromLatin1("definingEnd")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QMultiplicityElement::setPropertyData(); } -#include "moc_qconnectorend.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconnectorend.cpp" diff --git a/src/uml/qconnectorend.h b/src/uml/qconnectorend.h index 5e233136..3804af2f 100644 --- a/src/uml/qconnectorend.h +++ b/src/uml/qconnectorend.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,9 +65,9 @@ class Q_UML_EXPORT QConnectorEnd : public QMultiplicityElement { Q_OBJECT - Q_PROPERTY(QConnectableElement * role READ role WRITE setRole) - Q_PROPERTY(QProperty * partWithPort READ partWithPort WRITE setPartWithPort) - Q_PROPERTY(QProperty * definingEnd READ definingEnd STORED false) + Q_PROPERTY(QtUml::QConnectableElement * role READ role WRITE setRole) + Q_PROPERTY(QtUml::QProperty * partWithPort READ partWithPort WRITE setPartWithPort) + Q_PROPERTY(QtUml::QProperty * definingEnd READ definingEnd STORED false) Q_DISABLE_COPY(QConnectorEnd) Q_DECLARE_PRIVATE(QConnectorEnd) @@ -86,7 +89,9 @@ protected: explicit QConnectorEnd(QConnectorEndPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconnectorend_p.h b/src/uml/qconnectorend_p.h index 0e7c02d7..f35d7814 100644 --- a/src/uml/qconnectorend_p.h +++ b/src/uml/qconnectorend_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QProperty *partWithPort; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconsiderignorefragment.cpp b/src/uml/qconsiderignorefragment.cpp index 49536a41..6d9c4ea1 100644 --- a/src/uml/qconsiderignorefragment.cpp +++ b/src/uml/qconsiderignorefragment.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConsiderIgnoreFragmentPrivate::QConsiderIgnoreFragmentPrivate() { @@ -117,17 +120,19 @@ void QConsiderIgnoreFragment::removeMessage(QNamedElement *message) void QConsiderIgnoreFragment::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of messages that apply to this fragment"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of messages that apply to this fragment"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QCombinedFragment::setPropertyData(); } -#include "moc_qconsiderignorefragment.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconsiderignorefragment.cpp" diff --git a/src/uml/qconsiderignorefragment.h b/src/uml/qconsiderignorefragment.h index 4d51d223..df44b67b 100644 --- a/src/uml/qconsiderignorefragment.h +++ b/src/uml/qconsiderignorefragment.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QConsiderIgnoreFragment : public QCombinedFragment { Q_OBJECT - Q_PROPERTY(QSet<QNamedElement *> messages READ messages) + Q_PROPERTY(QSet<QtUml::QNamedElement *> messages READ messages) Q_DISABLE_COPY(QConsiderIgnoreFragment) Q_DECLARE_PRIVATE(QConsiderIgnoreFragment) @@ -84,7 +87,9 @@ protected: explicit QConsiderIgnoreFragment(QConsiderIgnoreFragmentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconsiderignorefragment_p.h b/src/uml/qconsiderignorefragment_p.h index 177ba29a..1e411df0 100644 --- a/src/uml/qconsiderignorefragment_p.h +++ b/src/uml/qconsiderignorefragment_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QSet<QNamedElement *> messages; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconstraint.cpp b/src/uml/qconstraint.cpp index 0e43f853..67a36c30 100644 --- a/src/uml/qconstraint.cpp +++ b/src/uml/qconstraint.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QConstraintPrivate::QConstraintPrivate() : context(0), @@ -182,31 +185,33 @@ void QConstraint::removeConstrainedElement(QElement *constrainedElement) void QConstraint::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedRule"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of Elements referenced by this Constraint."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedRule"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of Elements referenced by this Constraint."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QConstraint")][QString::fromLatin1("constrainedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QPackageableElement::setPropertyData(); } -#include "moc_qconstraint.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qconstraint.cpp" diff --git a/src/uml/qconstraint.h b/src/uml/qconstraint.h index dcdfae5d..e58885d2 100644 --- a/src/uml/qconstraint.h +++ b/src/uml/qconstraint.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QConstraint : public QPackageableElement { Q_OBJECT - Q_PROPERTY(QNamespace * context READ context WRITE setContext) - Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(QList<QElement *> constrainedElements READ constrainedElements) + Q_PROPERTY(QtUml::QNamespace * context READ context WRITE setContext) + Q_PROPERTY(QtUml::QValueSpecification * specification READ specification WRITE setSpecification) + Q_PROPERTY(QList<QtUml::QElement *> constrainedElements READ constrainedElements) Q_DISABLE_COPY(QConstraint) Q_DECLARE_PRIVATE(QConstraint) @@ -92,7 +95,9 @@ protected: explicit QConstraint(QConstraintPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qconstraint_p.h b/src/uml/qconstraint_p.h index e710dc30..bf6ecc01 100644 --- a/src/uml/qconstraint_p.h +++ b/src/uml/qconstraint_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QList<QElement *> constrainedElements; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcontinuation.cpp b/src/uml/qcontinuation.cpp index abcf6cfe..8f650aa3 100644 --- a/src/uml/qcontinuation.cpp +++ b/src/uml/qcontinuation.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QContinuationPrivate::QContinuationPrivate() : setting(true) @@ -114,17 +117,19 @@ void QContinuation::unsetSetting() void QContinuation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("True: when the Continuation is at the end of the enclosing InteractionFragment and False when it is in the beginning."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("True: when the Continuation is at the end of the enclosing InteractionFragment and False when it is in the beginning."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInteractionFragment::setPropertyData(); } -#include "moc_qcontinuation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcontinuation.cpp" diff --git a/src/uml/qcontinuation.h b/src/uml/qcontinuation.h index 93b79c5d..110c7f3f 100644 --- a/src/uml/qcontinuation.h +++ b/src/uml/qcontinuation.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -78,7 +81,9 @@ protected: explicit QContinuation(QContinuationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcontinuation_p.h b/src/uml/qcontinuation_p.h index c8e3808b..498749ed 100644 --- a/src/uml/qcontinuation_p.h +++ b/src/uml/qcontinuation_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QContinuation; @@ -64,7 +67,9 @@ public: bool setting; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcontrolflow.cpp b/src/uml/qcontrolflow.cpp index 2f2a4bbe..5350170e 100644 --- a/src/uml/qcontrolflow.cpp +++ b/src/uml/qcontrolflow.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QControlFlowPrivate::QControlFlowPrivate() { @@ -83,7 +86,9 @@ void QControlFlow::setPropertyData() QActivityEdge::setPropertyData(); } -#include "moc_qcontrolflow.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcontrolflow.cpp" diff --git a/src/uml/qcontrolflow.h b/src/uml/qcontrolflow.h index d455606c..2d02010d 100644 --- a/src/uml/qcontrolflow.h +++ b/src/uml/qcontrolflow.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QControlFlow(QControlFlowPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcontrolflow_p.h b/src/uml/qcontrolflow_p.h index dfd493da..27eb9bad 100644 --- a/src/uml/qcontrolflow_p.h +++ b/src/uml/qcontrolflow_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QControlFlow; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcontrolnode.cpp b/src/uml/qcontrolnode.cpp index 97ec959c..a3841029 100644 --- a/src/uml/qcontrolnode.cpp +++ b/src/uml/qcontrolnode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QControlNodePrivate::QControlNodePrivate() { @@ -83,7 +86,9 @@ void QControlNode::setPropertyData() QActivityNode::setPropertyData(); } -#include "moc_qcontrolnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcontrolnode.cpp" diff --git a/src/uml/qcontrolnode.h b/src/uml/qcontrolnode.h index 58082cee..def52f70 100644 --- a/src/uml/qcontrolnode.h +++ b/src/uml/qcontrolnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QControlNode(QControlNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcontrolnode_p.h b/src/uml/qcontrolnode_p.h index 842367ba..a3188cb7 100644 --- a/src/uml/qcontrolnode_p.h +++ b/src/uml/qcontrolnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcreatelinkaction.cpp b/src/uml/qcreatelinkaction.cpp index d9241c00..1143cf33 100644 --- a/src/uml/qcreatelinkaction.cpp +++ b/src/uml/qcreatelinkaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCreateLinkActionPrivate::QCreateLinkActionPrivate() { @@ -125,17 +128,19 @@ void QCreateLinkAction::removeEndData(QLinkEndCreationData *endData) void QCreateLinkAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies ends of association and inputs."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QLinkAction::endData"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies ends of association and inputs."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QLinkAction::endData"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWriteLinkAction::setPropertyData(); } -#include "moc_qcreatelinkaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcreatelinkaction.cpp" diff --git a/src/uml/qcreatelinkaction.h b/src/uml/qcreatelinkaction.h index f3b09a86..92e0e249 100644 --- a/src/uml/qcreatelinkaction.h +++ b/src/uml/qcreatelinkaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QCreateLinkAction : public QWriteLinkAction { Q_OBJECT - Q_PROPERTY(QSet<QLinkEndCreationData *> endData READ endData) + Q_PROPERTY(QSet<QtUml::QLinkEndCreationData *> endData READ endData) Q_DISABLE_COPY(QCreateLinkAction) Q_DECLARE_PRIVATE(QCreateLinkAction) @@ -84,7 +87,9 @@ protected: explicit QCreateLinkAction(QCreateLinkActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcreatelinkaction_p.h b/src/uml/qcreatelinkaction_p.h index d16e2219..ae173165 100644 --- a/src/uml/qcreatelinkaction_p.h +++ b/src/uml/qcreatelinkaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QSet<QLinkEndCreationData *> endData; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcreatelinkobjectaction.cpp b/src/uml/qcreatelinkobjectaction.cpp index d65e94e7..ccdd4bab 100644 --- a/src/uml/qcreatelinkobjectaction.cpp +++ b/src/uml/qcreatelinkobjectaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCreateLinkObjectActionPrivate::QCreateLinkObjectActionPrivate() : result(0) @@ -116,17 +119,19 @@ void QCreateLinkObjectAction::setResult(QOutputPin *result) void QCreateLinkObjectAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QCreateLinkAction::setPropertyData(); } -#include "moc_qcreatelinkobjectaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcreatelinkobjectaction.cpp" diff --git a/src/uml/qcreatelinkobjectaction.h b/src/uml/qcreatelinkobjectaction.h index 1522bf09..dc253598 100644 --- a/src/uml/qcreatelinkobjectaction.h +++ b/src/uml/qcreatelinkobjectaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QCreateLinkObjectAction : public QCreateLinkAction { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QCreateLinkObjectAction) Q_DECLARE_PRIVATE(QCreateLinkObjectAction) @@ -80,7 +83,9 @@ protected: explicit QCreateLinkObjectAction(QCreateLinkObjectActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcreatelinkobjectaction_p.h b/src/uml/qcreatelinkobjectaction_p.h index 95afe919..06d1df67 100644 --- a/src/uml/qcreatelinkobjectaction_p.h +++ b/src/uml/qcreatelinkobjectaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcreateobjectaction.cpp b/src/uml/qcreateobjectaction.cpp index 7130969f..c073084e 100644 --- a/src/uml/qcreateobjectaction.cpp +++ b/src/uml/qcreateobjectaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QCreateObjectActionPrivate::QCreateObjectActionPrivate() : classifier(0), @@ -139,24 +142,26 @@ void QCreateObjectAction::setResult(QOutputPin *result) void QCreateObjectAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Classifier to be instantiated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Classifier to be instantiated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QCreateObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qcreateobjectaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qcreateobjectaction.cpp" diff --git a/src/uml/qcreateobjectaction.h b/src/uml/qcreateobjectaction.h index 265a2c83..298afea3 100644 --- a/src/uml/qcreateobjectaction.h +++ b/src/uml/qcreateobjectaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QCreateObjectAction : public QAction { Q_OBJECT - Q_PROPERTY(QClassifier * classifier READ classifier WRITE setClassifier) - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QClassifier * classifier READ classifier WRITE setClassifier) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QCreateObjectAction) Q_DECLARE_PRIVATE(QCreateObjectAction) @@ -84,7 +87,9 @@ protected: explicit QCreateObjectAction(QCreateObjectActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qcreateobjectaction_p.h b/src/uml/qcreateobjectaction_p.h index eebba4ae..36435d23 100644 --- a/src/uml/qcreateobjectaction_p.h +++ b/src/uml/qcreateobjectaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdatastorenode.cpp b/src/uml/qdatastorenode.cpp index b66736a3..14e438e1 100644 --- a/src/uml/qdatastorenode.cpp +++ b/src/uml/qdatastorenode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDataStoreNodePrivate::QDataStoreNodePrivate() { @@ -83,7 +86,9 @@ void QDataStoreNode::setPropertyData() QCentralBufferNode::setPropertyData(); } -#include "moc_qdatastorenode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdatastorenode.cpp" diff --git a/src/uml/qdatastorenode.h b/src/uml/qdatastorenode.h index 1a07ce30..d432b20a 100644 --- a/src/uml/qdatastorenode.h +++ b/src/uml/qdatastorenode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QDataStoreNode(QDataStoreNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdatastorenode_p.h b/src/uml/qdatastorenode_p.h index 9031af52..f321b882 100644 --- a/src/uml/qdatastorenode_p.h +++ b/src/uml/qdatastorenode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QDataStoreNode; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdatatype.cpp b/src/uml/qdatatype.cpp index 05a43890..e05ce2db 100644 --- a/src/uml/qdatatype.cpp +++ b/src/uml/qdatatype.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDataTypePrivate::QDataTypePrivate() { @@ -189,24 +192,26 @@ QSet<QNamedElement *> QDataType::inherit(QSet<QNamedElement *> inhs) const void QDataType::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Operations owned by the DataType."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::datatype"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Attributes owned by the DataType."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::datatype"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Operations owned by the DataType."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::datatype"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Attributes owned by the DataType."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDataType")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::datatype"); QClassifier::setPropertyData(); } -#include "moc_qdatatype.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdatatype.cpp" diff --git a/src/uml/qdatatype.h b/src/uml/qdatatype.h index 24c12cda..3635edb5 100644 --- a/src/uml/qdatatype.h +++ b/src/uml/qdatatype.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,8 +70,8 @@ class Q_UML_EXPORT QDataType : public QClassifier { Q_OBJECT - Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QList<QtUml::QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QtUml::QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QDataType) Q_DECLARE_PRIVATE(QDataType) @@ -94,7 +97,9 @@ protected: explicit QDataType(QDataTypePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdatatype_p.h b/src/uml/qdatatype_p.h index 0da22458..58dd41d5 100644 --- a/src/uml/qdatatype_p.h +++ b/src/uml/qdatatype_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QList<QProperty *> ownedAttributes; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdecisionnode.cpp b/src/uml/qdecisionnode.cpp index 44e6e9fa..d4946aad 100644 --- a/src/uml/qdecisionnode.cpp +++ b/src/uml/qdecisionnode.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDecisionNodePrivate::QDecisionNodePrivate() : decisionInputFlow(0), @@ -131,24 +134,26 @@ void QDecisionNode::setDecisionInput(QBehavior *decisionInput) void QDecisionNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An additional edge incoming to the decision node that provides a decision input value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides input to guard specifications on edges outgoing from the decision node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An additional edge incoming to the decision node that provides a decision input value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides input to guard specifications on edges outgoing from the decision node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDecisionNode")][QString::fromLatin1("decisionInput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QControlNode::setPropertyData(); } -#include "moc_qdecisionnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdecisionnode.cpp" diff --git a/src/uml/qdecisionnode.h b/src/uml/qdecisionnode.h index 2d45be8c..b6ff296a 100644 --- a/src/uml/qdecisionnode.h +++ b/src/uml/qdecisionnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QDecisionNode : public QControlNode { Q_OBJECT - Q_PROPERTY(QObjectFlow * decisionInputFlow READ decisionInputFlow WRITE setDecisionInputFlow) - Q_PROPERTY(QBehavior * decisionInput READ decisionInput WRITE setDecisionInput) + Q_PROPERTY(QtUml::QObjectFlow * decisionInputFlow READ decisionInputFlow WRITE setDecisionInputFlow) + Q_PROPERTY(QtUml::QBehavior * decisionInput READ decisionInput WRITE setDecisionInput) Q_DISABLE_COPY(QDecisionNode) Q_DECLARE_PRIVATE(QDecisionNode) @@ -84,7 +87,9 @@ protected: explicit QDecisionNode(QDecisionNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdecisionnode_p.h b/src/uml/qdecisionnode_p.h index 9d06743b..cd5197ff 100644 --- a/src/uml/qdecisionnode_p.h +++ b/src/uml/qdecisionnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QBehavior *decisionInput; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdependency.cpp b/src/uml/qdependency.cpp index bb5f034c..68d06466 100644 --- a/src/uml/qdependency.cpp +++ b/src/uml/qdependency.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDependencyPrivate::QDependencyPrivate() { @@ -227,19 +230,19 @@ void QDependency::removeClientDependency(QDependency *clientDependency) /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QDependency::visibility() const +QtUmlNS::VisibilityKind QDependency::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QDependency::setVisibility(QtUml::VisibilityKind visibility) +void QDependency::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QDependency::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QDependency); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -363,24 +366,26 @@ void QDependency::removeSupplier(QNamedElement *supplier) void QDependency::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element(s) dependent on the supplier element(s). In some cases (such as a Trace Abstraction) the assignment of direction (that is, the designation of the client element) is at the discretion of the modeler, and is a stipulation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamedElement::clientDependency"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element(s) dependent on the supplier element(s). In some cases (such as a Trace Abstraction) the assignment of direction (that is, the designation of the client element) is at the discretion of the modeler, and is a stipulation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamedElement::clientDependency"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element(s) independent of the client element(s), in the same respect and the same dependency relationship. In some directed dependency relationships (such as Refinement Abstractions), a common convention in the domain of class-based OO software is to put the more abstract element in this role. Despite this convention, users of UML may stipulate a sense of dependency suitable for their domain, which makes a more abstract element dependent on that which is more specific."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element(s) independent of the client element(s), in the same respect and the same dependency relationship. In some directed dependency relationships (such as Refinement Abstractions), a common convention in the domain of class-based OO software is to put the more abstract element in this role. Despite this convention, users of UML may stipulate a sense of dependency suitable for their domain, which makes a more abstract element dependent on that which is more specific."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDependency")][QString::fromLatin1("suppliers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qdependency.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdependency.cpp" diff --git a/src/uml/qdependency.h b/src/uml/qdependency.h index a0132a87..0ac744d8 100644 --- a/src/uml/qdependency.h +++ b/src/uml/qdependency.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,28 +69,28 @@ class Q_UML_EXPORT QDependency : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtUml::QElement *> relatedElements READ relatedElements) - Q_PROPERTY(QSet<QElement *> sources READ sources) - Q_PROPERTY(QSet<QElement *> targets READ targets) + Q_PROPERTY(QSet<QtUml::QElement *> sources READ sources) + Q_PROPERTY(QSet<QtUml::QElement *> targets READ targets) - Q_PROPERTY(QSet<QNamedElement *> clients READ clients) - Q_PROPERTY(QSet<QNamedElement *> suppliers READ suppliers) + Q_PROPERTY(QSet<QtUml::QNamedElement *> clients READ clients) + Q_PROPERTY(QSet<QtUml::QNamedElement *> suppliers READ suppliers) Q_DISABLE_COPY(QDependency) Q_DECLARE_PRIVATE(QDependency) @@ -123,8 +126,8 @@ public: Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QRelationship @@ -152,7 +155,9 @@ private: QDirectedRelationship *_wrappedDirectedRelationship; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdependency_p.h b/src/uml/qdependency_p.h index f6ae35f8..e67aef06 100644 --- a/src/uml/qdependency_p.h +++ b/src/uml/qdependency_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QSet<QNamedElement *> suppliers; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeployedartifact.cpp b/src/uml/qdeployedartifact.cpp index 24584ea1..83364570 100644 --- a/src/uml/qdeployedartifact.cpp +++ b/src/uml/qdeployedartifact.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDeployedArtifactPrivate::QDeployedArtifactPrivate() { @@ -83,7 +86,9 @@ void QDeployedArtifact::setPropertyData() QNamedElement::setPropertyData(); } -#include "moc_qdeployedartifact.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdeployedartifact.cpp" diff --git a/src/uml/qdeployedartifact.h b/src/uml/qdeployedartifact.h index a676c188..14a2f6e9 100644 --- a/src/uml/qdeployedartifact.h +++ b/src/uml/qdeployedartifact.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QDeployedArtifact(QDeployedArtifactPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeployedartifact_p.h b/src/uml/qdeployedartifact_p.h index 6dda53a3..20a7f2ae 100644 --- a/src/uml/qdeployedartifact_p.h +++ b/src/uml/qdeployedartifact_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeployment.cpp b/src/uml/qdeployment.cpp index 840f6fee..428ea5b4 100644 --- a/src/uml/qdeployment.cpp +++ b/src/uml/qdeployment.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDeploymentPrivate::QDeploymentPrivate() : location(0) @@ -207,26 +210,26 @@ void QDeployment::removeDeployedArtifact(QDeployedArtifact *deployedArtifact) void QDeployment::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DeployedTarget which is the target of a Deployment."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDependency::clients"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeploymentTarget::deployment"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of properties that parameterize the deployment and execution of one or more Artifacts."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeploymentSpecification::deployment"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Artifacts that are deployed onto a Node. This association specializes the supplier association."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DeployedTarget which is the target of a Deployment."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDependency::clients"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeploymentTarget::deployment"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of properties that parameterize the deployment and execution of one or more Artifacts."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("configurations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeploymentSpecification::deployment"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Artifacts that are deployed onto a Node. This association specializes the supplier association."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeployment")][QString::fromLatin1("deployedArtifacts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDependency::setPropertyData(); } @@ -254,7 +257,9 @@ void QDeployment::removeSupplier(QWrappedObjectPointer<QDeployedArtifact> deploy removeDeployedArtifact(deployedArtifact); } -#include "moc_qdeployment.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdeployment.cpp" diff --git a/src/uml/qdeployment.h b/src/uml/qdeployment.h index 3985d34f..db7de7f5 100644 --- a/src/uml/qdeployment.h +++ b/src/uml/qdeployment.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,9 +71,9 @@ class Q_UML_EXPORT QDeployment : public QDependency { Q_OBJECT - Q_PROPERTY(QDeploymentTarget * location READ location WRITE setLocation) - Q_PROPERTY(QSet<QDeploymentSpecification *> configurations READ configurations) - Q_PROPERTY(QSet<QDeployedArtifact *> deployedArtifacts READ deployedArtifacts) + Q_PROPERTY(QtUml::QDeploymentTarget * location READ location WRITE setLocation) + Q_PROPERTY(QSet<QtUml::QDeploymentSpecification *> configurations READ configurations) + Q_PROPERTY(QSet<QtUml::QDeployedArtifact *> deployedArtifacts READ deployedArtifacts) Q_DISABLE_COPY(QDeployment) Q_DECLARE_PRIVATE(QDeployment) @@ -101,7 +104,9 @@ protected: explicit QDeployment(QDeploymentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeployment_p.h b/src/uml/qdeployment_p.h index e1646f20..bf580baf 100644 --- a/src/uml/qdeployment_p.h +++ b/src/uml/qdeployment_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QSet<QDeployedArtifact *> deployedArtifacts; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeploymentspecification.cpp b/src/uml/qdeploymentspecification.cpp index 05a64907..27a5668a 100644 --- a/src/uml/qdeploymentspecification.cpp +++ b/src/uml/qdeploymentspecification.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDeploymentSpecificationPrivate::QDeploymentSpecificationPrivate() : deployment(0) @@ -165,31 +168,33 @@ void QDeploymentSpecification::setDeployment(QDeployment *deployment) void QDeploymentSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The location where an Artifact is deployed onto a Node. This is typically a 'directory' or 'memory address'."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The location where a component Artifact executes. This may be a local or remote location."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The deployment with which the DeploymentSpecification is associated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeployment::configuration"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The location where an Artifact is deployed onto a Node. This is typically a 'directory' or 'memory address'."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The location where a component Artifact executes. This may be a local or remote location."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("executionLocation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The deployment with which the DeploymentSpecification is associated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentSpecification")][QString::fromLatin1("deployment")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeployment::configuration"); QArtifact::setPropertyData(); } -#include "moc_qdeploymentspecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdeploymentspecification.cpp" diff --git a/src/uml/qdeploymentspecification.h b/src/uml/qdeploymentspecification.h index 3521dbd6..b1c6730a 100644 --- a/src/uml/qdeploymentspecification.h +++ b/src/uml/qdeploymentspecification.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,7 +69,7 @@ class Q_UML_EXPORT QDeploymentSpecification : public QArtifact Q_PROPERTY(QString deploymentLocation READ deploymentLocation WRITE setDeploymentLocation) Q_PROPERTY(QString executionLocation READ executionLocation WRITE setExecutionLocation) - Q_PROPERTY(QDeployment * deployment READ deployment WRITE setDeployment) + Q_PROPERTY(QtUml::QDeployment * deployment READ deployment WRITE setDeployment) Q_DISABLE_COPY(QDeploymentSpecification) Q_DECLARE_PRIVATE(QDeploymentSpecification) @@ -91,7 +94,9 @@ protected: explicit QDeploymentSpecification(QDeploymentSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeploymentspecification_p.h b/src/uml/qdeploymentspecification_p.h index c64786d4..516fc29f 100644 --- a/src/uml/qdeploymentspecification_p.h +++ b/src/uml/qdeploymentspecification_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QDeployment *deployment; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeploymenttarget.cpp b/src/uml/qdeploymenttarget.cpp index c501d587..a8279965 100644 --- a/src/uml/qdeploymenttarget.cpp +++ b/src/uml/qdeploymenttarget.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDeploymentTargetPrivate::QDeploymentTargetPrivate() { @@ -144,19 +147,19 @@ void QDeploymentTarget::removeDeployment(QDeployment *deployment) void QDeploymentTarget::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of Deployments for a DeploymentTarget."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeployment::location"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of elements that are manifested in an Artifact that is involved in Deployment to a DeploymentTarget."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of Deployments for a DeploymentTarget."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QNamedElement::clientDependencies"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDeploymentTarget")][QString::fromLatin1("deployments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDeployment::location"); QNamedElement::setPropertyData(); } @@ -173,7 +176,9 @@ void QDeploymentTarget::removeClientDependency(QWrappedObjectPointer<QDeployment removeDeployment(deployment); } -#include "moc_qdeploymenttarget.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdeploymenttarget.cpp" diff --git a/src/uml/qdeploymenttarget.h b/src/uml/qdeploymenttarget.h index 31b27a65..522a2ceb 100644 --- a/src/uml/qdeploymenttarget.h +++ b/src/uml/qdeploymenttarget.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,8 +70,8 @@ class Q_UML_EXPORT QDeploymentTarget : public QNamedElement { Q_OBJECT - Q_PROPERTY(QSet<QPackageableElement *> deployedElements READ deployedElements STORED false) - Q_PROPERTY(QSet<QDeployment *> deployments READ deployments) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> deployedElements READ deployedElements STORED false) + Q_PROPERTY(QSet<QtUml::QDeployment *> deployments READ deployments) Q_DISABLE_COPY(QDeploymentTarget) Q_DECLARE_PRIVATE(QDeploymentTarget) @@ -93,7 +96,9 @@ protected: explicit QDeploymentTarget(QDeploymentTargetPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdeploymenttarget_p.h b/src/uml/qdeploymenttarget_p.h index fd2bc815..a75bf078 100644 --- a/src/uml/qdeploymenttarget_p.h +++ b/src/uml/qdeploymenttarget_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QSet<QDeployment *> deployments; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdestroylinkaction.cpp b/src/uml/qdestroylinkaction.cpp index 3c33559e..9e6830ba 100644 --- a/src/uml/qdestroylinkaction.cpp +++ b/src/uml/qdestroylinkaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDestroyLinkActionPrivate::QDestroyLinkActionPrivate() { @@ -125,17 +128,19 @@ void QDestroyLinkAction::removeEndData(QLinkEndDestructionData *endData) void QDestroyLinkAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies ends of association and inputs."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QLinkAction::endData"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies ends of association and inputs."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QLinkAction::endData"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWriteLinkAction::setPropertyData(); } -#include "moc_qdestroylinkaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdestroylinkaction.cpp" diff --git a/src/uml/qdestroylinkaction.h b/src/uml/qdestroylinkaction.h index 97cb2d24..ada4e11b 100644 --- a/src/uml/qdestroylinkaction.h +++ b/src/uml/qdestroylinkaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QDestroyLinkAction : public QWriteLinkAction { Q_OBJECT - Q_PROPERTY(QSet<QLinkEndDestructionData *> endData READ endData) + Q_PROPERTY(QSet<QtUml::QLinkEndDestructionData *> endData READ endData) Q_DISABLE_COPY(QDestroyLinkAction) Q_DECLARE_PRIVATE(QDestroyLinkAction) @@ -84,7 +87,9 @@ protected: explicit QDestroyLinkAction(QDestroyLinkActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdestroylinkaction_p.h b/src/uml/qdestroylinkaction_p.h index 97677114..87994a2c 100644 --- a/src/uml/qdestroylinkaction_p.h +++ b/src/uml/qdestroylinkaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QSet<QLinkEndDestructionData *> endData; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdestroyobjectaction.cpp b/src/uml/qdestroyobjectaction.cpp index 41d91114..341939e1 100644 --- a/src/uml/qdestroyobjectaction.cpp +++ b/src/uml/qdestroyobjectaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDestroyObjectActionPrivate::QDestroyObjectActionPrivate() : isDestroyLinks(false), @@ -180,31 +183,33 @@ void QDestroyObjectAction::setTarget(QInputPin *target) void QDestroyObjectAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether links in which the object participates are destroyed along with the object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether objects owned by the object are destroyed along with the object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The input pin providing the object to be destroyed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether links in which the object participates are destroyed along with the object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether objects owned by the object are destroyed along with the object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("isDestroyOwnedObjects")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The input pin providing the object to be destroyed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDestroyObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qdestroyobjectaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdestroyobjectaction.cpp" diff --git a/src/uml/qdestroyobjectaction.h b/src/uml/qdestroyobjectaction.h index 4148c567..57b03bfa 100644 --- a/src/uml/qdestroyobjectaction.h +++ b/src/uml/qdestroyobjectaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,7 +66,7 @@ class Q_UML_EXPORT QDestroyObjectAction : public QAction Q_PROPERTY(bool isDestroyLinks READ isDestroyLinks WRITE setDestroyLinks RESET unsetDestroyLinks) Q_PROPERTY(bool isDestroyOwnedObjects READ isDestroyOwnedObjects WRITE setDestroyOwnedObjects RESET unsetDestroyOwnedObjects) - Q_PROPERTY(QInputPin * target READ target WRITE setTarget) + Q_PROPERTY(QtUml::QInputPin * target READ target WRITE setTarget) Q_DISABLE_COPY(QDestroyObjectAction) Q_DECLARE_PRIVATE(QDestroyObjectAction) @@ -90,7 +93,9 @@ protected: explicit QDestroyObjectAction(QDestroyObjectActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdestroyobjectaction_p.h b/src/uml/qdestroyobjectaction_p.h index a33a0fc2..89aedeab 100644 --- a/src/uml/qdestroyobjectaction_p.h +++ b/src/uml/qdestroyobjectaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QInputPin *target; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdestructionoccurrencespecification.cpp b/src/uml/qdestructionoccurrencespecification.cpp index 0010c668..5aba9aa8 100644 --- a/src/uml/qdestructionoccurrencespecification.cpp +++ b/src/uml/qdestructionoccurrencespecification.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDestructionOccurrenceSpecificationPrivate::QDestructionOccurrenceSpecificationPrivate() { @@ -83,7 +86,9 @@ void QDestructionOccurrenceSpecification::setPropertyData() QMessageOccurrenceSpecification::setPropertyData(); } -#include "moc_qdestructionoccurrencespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdestructionoccurrencespecification.cpp" diff --git a/src/uml/qdestructionoccurrencespecification.h b/src/uml/qdestructionoccurrencespecification.h index 2d57c57f..415da939 100644 --- a/src/uml/qdestructionoccurrencespecification.h +++ b/src/uml/qdestructionoccurrencespecification.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QDestructionOccurrenceSpecification(QDestructionOccurrenceSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdestructionoccurrencespecification_p.h b/src/uml/qdestructionoccurrencespecification_p.h index 00cca3d0..0b76f1b1 100644 --- a/src/uml/qdestructionoccurrencespecification_p.h +++ b/src/uml/qdestructionoccurrencespecification_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QDestructionOccurrenceSpecification; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdevice.cpp b/src/uml/qdevice.cpp index 99572bc8..1ca76ad3 100644 --- a/src/uml/qdevice.cpp +++ b/src/uml/qdevice.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDevicePrivate::QDevicePrivate() { @@ -83,7 +86,9 @@ void QDevice::setPropertyData() QNode::setPropertyData(); } -#include "moc_qdevice.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdevice.cpp" diff --git a/src/uml/qdevice.h b/src/uml/qdevice.h index 48440897..0ed7de9b 100644 --- a/src/uml/qdevice.h +++ b/src/uml/qdevice.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QDevice(QDevicePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdevice_p.h b/src/uml/qdevice_p.h index cc4a7dfe..03cd6886 100644 --- a/src/uml/qdevice_p.h +++ b/src/uml/qdevice_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QDevice; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdirectedrelationship.cpp b/src/uml/qdirectedrelationship.cpp index 3fe82800..a973fe4c 100644 --- a/src/uml/qdirectedrelationship.cpp +++ b/src/uml/qdirectedrelationship.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDirectedRelationshipPrivate::QDirectedRelationshipPrivate() { @@ -156,24 +159,26 @@ QSet<QElement *> QDirectedRelationship::targets() const void QDirectedRelationship::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the sources of the DirectedRelationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the targets of the DirectedRelationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the sources of the DirectedRelationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the targets of the DirectedRelationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRelationship::relatedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDirectedRelationship")][QString::fromLatin1("targets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QRelationship::setPropertyData(); } -#include "moc_qdirectedrelationship.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdirectedrelationship.cpp" diff --git a/src/uml/qdirectedrelationship.h b/src/uml/qdirectedrelationship.h index 77c803cd..1b6f011f 100644 --- a/src/uml/qdirectedrelationship.h +++ b/src/uml/qdirectedrelationship.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,8 +67,8 @@ class Q_UML_EXPORT QDirectedRelationship : public QRelationship { Q_OBJECT - Q_PROPERTY(QSet<QElement *> sources READ sources) - Q_PROPERTY(QSet<QElement *> targets READ targets) + Q_PROPERTY(QSet<QtUml::QElement *> sources READ sources) + Q_PROPERTY(QSet<QtUml::QElement *> targets READ targets) Q_DISABLE_COPY(QDirectedRelationship) Q_DECLARE_PRIVATE(QDirectedRelationship) @@ -84,7 +87,9 @@ protected: explicit QDirectedRelationship(QDirectedRelationshipPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdirectedrelationship_p.h b/src/uml/qdirectedrelationship_p.h index 4dc4b21c..6aa636c9 100644 --- a/src/uml/qdirectedrelationship_p.h +++ b/src/uml/qdirectedrelationship_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -76,7 +79,9 @@ public: void removeTarget(QElement *target); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qduration.cpp b/src/uml/qduration.cpp index ef5a755f..7ea82cb1 100644 --- a/src/uml/qduration.cpp +++ b/src/uml/qduration.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDurationPrivate::QDurationPrivate() : expr(0) @@ -147,24 +150,26 @@ void QDuration::removeObservation(QObservation *observation) void QDuration::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of the Duration."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the time and duration observations that are involved in expr."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of the Duration."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the time and duration observations that are involved in expr."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDuration")][QString::fromLatin1("observations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qduration.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qduration.cpp" diff --git a/src/uml/qduration.h b/src/uml/qduration.h index 7ac0415d..01905147 100644 --- a/src/uml/qduration.h +++ b/src/uml/qduration.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,8 +67,8 @@ class Q_UML_EXPORT QDuration : public QValueSpecification { Q_OBJECT - Q_PROPERTY(QValueSpecification * expr READ expr WRITE setExpr) - Q_PROPERTY(QSet<QObservation *> observations READ observations) + Q_PROPERTY(QtUml::QValueSpecification * expr READ expr WRITE setExpr) + Q_PROPERTY(QSet<QtUml::QObservation *> observations READ observations) Q_DISABLE_COPY(QDuration) Q_DECLARE_PRIVATE(QDuration) @@ -87,7 +90,9 @@ protected: explicit QDuration(QDurationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qduration_p.h b/src/uml/qduration_p.h index 2f6bf522..3a37c1a4 100644 --- a/src/uml/qduration_p.h +++ b/src/uml/qduration_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QSet<QObservation *> observations; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdurationconstraint.cpp b/src/uml/qdurationconstraint.cpp index aa71eda9..9fdbe867 100644 --- a/src/uml/qdurationconstraint.cpp +++ b/src/uml/qdurationconstraint.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDurationConstraintPrivate::QDurationConstraintPrivate() : specification(0) @@ -149,24 +152,26 @@ void QDurationConstraint::setSpecification(QDurationInterval *specification) void QDurationConstraint::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent[i] is related to constrainedElement[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters constrainedElement[i]. If firstEvent[i] is false, then the corresponding observation event is the last time instant the execution is within constrainedElement[i]. Default value is true applied when constrainedElement[i] refers an element that represents only one time instant."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The interval constraining the duration."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QIntervalConstraint::specification"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent[i] is related to constrainedElement[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters constrainedElement[i]. If firstEvent[i] is false, then the corresponding observation event is the last time instant the execution is within constrainedElement[i]. Default value is true applied when constrainedElement[i] refers an element that represents only one time instant."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The interval constraining the duration."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QIntervalConstraint::specification"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QIntervalConstraint::setPropertyData(); } -#include "moc_qdurationconstraint.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdurationconstraint.cpp" diff --git a/src/uml/qdurationconstraint.h b/src/uml/qdurationconstraint.h index af33fa70..db57f6b5 100644 --- a/src/uml/qdurationconstraint.h +++ b/src/uml/qdurationconstraint.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,7 +68,7 @@ class Q_UML_EXPORT QDurationConstraint : public QIntervalConstraint Q_OBJECT Q_PROPERTY(QSet<bool> firstEvents READ firstEvents) - Q_PROPERTY(QDurationInterval * specification READ specification WRITE setSpecification) + Q_PROPERTY(QtUml::QDurationInterval * specification READ specification WRITE setSpecification) Q_DISABLE_COPY(QDurationConstraint) Q_DECLARE_PRIVATE(QDurationConstraint) @@ -89,7 +92,9 @@ protected: explicit QDurationConstraint(QDurationConstraintPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdurationconstraint_p.h b/src/uml/qdurationconstraint_p.h index c22dde53..2b1e1448 100644 --- a/src/uml/qdurationconstraint_p.h +++ b/src/uml/qdurationconstraint_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QDurationInterval *specification; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdurationinterval.cpp b/src/uml/qdurationinterval.cpp index f97a921d..3bb97c8b 100644 --- a/src/uml/qdurationinterval.cpp +++ b/src/uml/qdurationinterval.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDurationIntervalPrivate::QDurationIntervalPrivate() : max(0), @@ -136,24 +139,26 @@ void QDurationInterval::setMin(QDuration *min) void QDurationInterval::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the Duration denoting the maximum value of the range."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::max"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the Duration denoting the minimum value of the range."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::min"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the Duration denoting the maximum value of the range."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::max"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the Duration denoting the minimum value of the range."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::min"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationInterval")][QString::fromLatin1("min")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInterval::setPropertyData(); } -#include "moc_qdurationinterval.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdurationinterval.cpp" diff --git a/src/uml/qdurationinterval.h b/src/uml/qdurationinterval.h index 400232bc..bb603630 100644 --- a/src/uml/qdurationinterval.h +++ b/src/uml/qdurationinterval.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QDurationInterval : public QInterval { Q_OBJECT - Q_PROPERTY(QDuration * max READ max WRITE setMax) - Q_PROPERTY(QDuration * min READ min WRITE setMin) + Q_PROPERTY(QtUml::QDuration * max READ max WRITE setMax) + Q_PROPERTY(QtUml::QDuration * min READ min WRITE setMin) Q_DISABLE_COPY(QDurationInterval) Q_DECLARE_PRIVATE(QDurationInterval) @@ -83,7 +86,9 @@ protected: explicit QDurationInterval(QDurationIntervalPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdurationinterval_p.h b/src/uml/qdurationinterval_p.h index 66fe8ba4..b66bcd85 100644 --- a/src/uml/qdurationinterval_p.h +++ b/src/uml/qdurationinterval_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QDuration *min; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdurationobservation.cpp b/src/uml/qdurationobservation.cpp index 0f966868..afcd92bf 100644 --- a/src/uml/qdurationobservation.cpp +++ b/src/uml/qdurationobservation.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QDurationObservationPrivate::QDurationObservationPrivate() { @@ -152,24 +155,26 @@ void QDurationObservation::removeEvent(QNamedElement *event) void QDurationObservation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent[i] is related to event[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters event[i]. If firstEvent[i] is false, then the corresponding observation event is the time instant the execution exits event[i]. Default value is true applied when event[i] refers an element that represents only one time instant."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The observation is determined by the entering or exiting of the event element during execution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent[i] is related to event[i] (where i is 1 or 2). If firstEvent[i] is true, then the corresponding observation event is the first time instant the execution enters event[i]. If firstEvent[i] is false, then the corresponding observation event is the time instant the execution exits event[i]. Default value is true applied when event[i] refers an element that represents only one time instant."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The observation is determined by the entering or exiting of the event element during execution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QDurationObservation")][QString::fromLatin1("events")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QObservation::setPropertyData(); } -#include "moc_qdurationobservation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qdurationobservation.cpp" diff --git a/src/uml/qdurationobservation.h b/src/uml/qdurationobservation.h index 25915dc2..5506db30 100644 --- a/src/uml/qdurationobservation.h +++ b/src/uml/qdurationobservation.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,7 +68,7 @@ class Q_UML_EXPORT QDurationObservation : public QObservation Q_OBJECT Q_PROPERTY(QSet<bool> firstEvents READ firstEvents) - Q_PROPERTY(QSet<QNamedElement *> events READ events) + Q_PROPERTY(QSet<QtUml::QNamedElement *> events READ events) Q_DISABLE_COPY(QDurationObservation) Q_DECLARE_PRIVATE(QDurationObservation) @@ -90,7 +93,9 @@ protected: explicit QDurationObservation(QDurationObservationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qdurationobservation_p.h b/src/uml/qdurationobservation_p.h index 9ef3ecc5..fbe24153 100644 --- a/src/uml/qdurationobservation_p.h +++ b/src/uml/qdurationobservation_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QSet<QNamedElement *> events; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qelement.cpp b/src/uml/qelement.cpp index a26f32b1..024e006b 100644 --- a/src/uml/qelement.cpp +++ b/src/uml/qelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QElementPrivate::QElementPrivate() : owner(0) @@ -209,26 +212,26 @@ bool QElement::mustBeOwned() const void QElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Elements owned by this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::owner"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Element that owns this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("owner")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::ownedElement"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Comments owned by this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Elements owned by this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::owner"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Element that owns this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("owner")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElement::ownedElement"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Comments owned by this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElement")][QString::fromLatin1("ownedComments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } @@ -241,7 +244,9 @@ void QElement::allOwnedElements(QSet<QElement *> &allOwnedElements_) const element->allOwnedElements(allOwnedElements_); } -#include "moc_qelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qelement.cpp" diff --git a/src/uml/qelement.h b/src/uml/qelement.h index 47aaa8ac..d1ee6227 100644 --- a/src/uml/qelement.h +++ b/src/uml/qelement.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,9 +67,9 @@ class Q_UML_EXPORT QElement : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_DISABLE_COPY(QElement) Q_DECLARE_PRIVATE(QElement) @@ -95,7 +98,9 @@ private: void allOwnedElements(QSet<QElement *> &allOwnedElements_) const; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qelement_p.h b/src/uml/qelement_p.h index cd72ff38..9e4a9eab 100644 --- a/src/uml/qelement_p.h +++ b/src/uml/qelement_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ public: void setOwner(QElement *owner); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qelementimport.cpp b/src/uml/qelementimport.cpp index 34327b72..42e04f95 100644 --- a/src/uml/qelementimport.cpp +++ b/src/uml/qelementimport.cpp @@ -47,10 +47,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QElementImportPrivate::QElementImportPrivate() : - visibility(QtUml::VisibilityPublic), + visibility(QtUmlNS::VisibilityPublic), importedElement(0), importingNamespace(0) { @@ -112,7 +115,7 @@ void QElementImport::setAlias(QString alias) /*! Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import. */ -QtUml::VisibilityKind QElementImport::visibility() const +QtUmlNS::VisibilityKind QElementImport::visibility() const { // This is a read-write attribute @@ -120,7 +123,7 @@ QtUml::VisibilityKind QElementImport::visibility() const return d->visibility; } -void QElementImport::setVisibility(QtUml::VisibilityKind visibility) +void QElementImport::setVisibility(QtUmlNS::VisibilityKind visibility) { // This is a read-write attribute @@ -133,7 +136,7 @@ void QElementImport::setVisibility(QtUml::VisibilityKind visibility) void QElementImport::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QElementImport); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -221,38 +224,40 @@ QString QElementImport::getName() const void QElementImport::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the name that should be added to the namespace of the importing package in lieu of the name of the imported packagable element. The aliased name must not clash with any other member name in the importing package. By default, no alias is used."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the PackageableElement whose name is to be added to a Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports a PackageableElement from another Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::elementImport"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the name that should be added to the namespace of the importing package in lieu of the name of the imported packagable element. The aliased name must not clash with any other member name in the importing package. By default, no alias is used."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElement within the importing Package. The default visibility is the same as that of the imported element. If the imported element does not have a visibility, it is possible to add visibility to the element import."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the PackageableElement whose name is to be added to a Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importedElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports a PackageableElement from another Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QElementImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::elementImport"); QDirectedRelationship::setPropertyData(); } -#include "moc_qelementimport.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qelementimport.cpp" diff --git a/src/uml/qelementimport.h b/src/uml/qelementimport.h index 73b20856..11650e72 100644 --- a/src/uml/qelementimport.h +++ b/src/uml/qelementimport.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,9 +72,9 @@ class Q_UML_EXPORT QElementImport : public QDirectedRelationship Q_OBJECT Q_PROPERTY(QString alias READ alias WRITE setAlias) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QPackageableElement * importedElement READ importedElement WRITE setImportedElement) - Q_PROPERTY(QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUml::QPackageableElement * importedElement READ importedElement WRITE setImportedElement) + Q_PROPERTY(QtUml::QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) Q_DISABLE_COPY(QElementImport) Q_DECLARE_PRIVATE(QElementImport) @@ -83,8 +86,8 @@ public: // Attributes from QElementImport Q_INVOKABLE QString alias() const; Q_INVOKABLE void setAlias(QString alias); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from QElementImport @@ -102,7 +105,9 @@ protected: explicit QElementImport(QElementImportPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qelementimport_p.h b/src/uml/qelementimport_p.h index c14adc9b..ff8878f3 100644 --- a/src/uml/qelementimport_p.h +++ b/src/uml/qelementimport_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,12 +75,14 @@ public: virtual ~QElementImportPrivate(); QString alias; - QtUml::VisibilityKind visibility; + QtUmlNS::VisibilityKind visibility; QPackageableElement *importedElement; QNamespace *importingNamespace; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qencapsulatedclassifier.cpp b/src/uml/qencapsulatedclassifier.cpp index 4413b9f9..07774188 100644 --- a/src/uml/qencapsulatedclassifier.cpp +++ b/src/uml/qencapsulatedclassifier.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QEncapsulatedClassifierPrivate::QEncapsulatedClassifierPrivate() { @@ -101,17 +104,19 @@ QSet<QPort *> QEncapsulatedClassifier::ownedPorts() const void QEncapsulatedClassifier::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a set of ports that an encapsulated classifier owns."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QStructuredClassifier::ownedAttributes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a set of ports that an encapsulated classifier owns."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QStructuredClassifier::ownedAttributes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QStructuredClassifier::setPropertyData(); } -#include "moc_qencapsulatedclassifier.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qencapsulatedclassifier.cpp" diff --git a/src/uml/qencapsulatedclassifier.h b/src/uml/qencapsulatedclassifier.h index 302e87d1..87e16a9e 100644 --- a/src/uml/qencapsulatedclassifier.h +++ b/src/uml/qencapsulatedclassifier.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QEncapsulatedClassifier : public QStructuredClassifier { Q_OBJECT - Q_PROPERTY(QSet<QPort *> ownedPorts READ ownedPorts STORED false) + Q_PROPERTY(QSet<QtUml::QPort *> ownedPorts READ ownedPorts STORED false) Q_DISABLE_COPY(QEncapsulatedClassifier) Q_DECLARE_PRIVATE(QEncapsulatedClassifier) @@ -82,7 +85,9 @@ protected: explicit QEncapsulatedClassifier(QEncapsulatedClassifierPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qencapsulatedclassifier_p.h b/src/uml/qencapsulatedclassifier_p.h index 9fe8a328..04eb01f3 100644 --- a/src/uml/qencapsulatedclassifier_p.h +++ b/src/uml/qencapsulatedclassifier_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qenumeration.cpp b/src/uml/qenumeration.cpp index 94f44725..11f15454 100644 --- a/src/uml/qenumeration.cpp +++ b/src/uml/qenumeration.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QEnumerationPrivate::QEnumerationPrivate() { @@ -129,17 +132,19 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral) void QEnumeration::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of literals for this Enumeration."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumerationLiteral::enumeration"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of literals for this Enumeration."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumerationLiteral::enumeration"); QDataType::setPropertyData(); } -#include "moc_qenumeration.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qenumeration.cpp" diff --git a/src/uml/qenumeration.h b/src/uml/qenumeration.h index 3cde14b2..867c6e70 100644 --- a/src/uml/qenumeration.h +++ b/src/uml/qenumeration.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QEnumeration : public QDataType { Q_OBJECT - Q_PROPERTY(QList<QEnumerationLiteral *> ownedLiterals READ ownedLiterals) + Q_PROPERTY(QList<QtUml::QEnumerationLiteral *> ownedLiterals READ ownedLiterals) Q_DISABLE_COPY(QEnumeration) Q_DECLARE_PRIVATE(QEnumeration) @@ -84,7 +87,9 @@ protected: explicit QEnumeration(QEnumerationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qenumeration_p.h b/src/uml/qenumeration_p.h index 252c82eb..40e9a938 100644 --- a/src/uml/qenumeration_p.h +++ b/src/uml/qenumeration_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QList<QEnumerationLiteral *> ownedLiterals; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qenumerationliteral.cpp b/src/uml/qenumerationliteral.cpp index ad411c76..5b469112 100644 --- a/src/uml/qenumerationliteral.cpp +++ b/src/uml/qenumerationliteral.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QEnumerationLiteralPrivate::QEnumerationLiteralPrivate() : enumeration(0) @@ -131,24 +134,26 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration) void QEnumerationLiteral::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier of this EnumerationLiteral derived to be equal to its enumeration."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInstanceSpecification::classifiers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Enumeration that this EnumerationLiteral is a member of."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumeration::ownedLiteral"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier of this EnumerationLiteral derived to be equal to its enumeration."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInstanceSpecification::classifiers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Enumeration that this EnumerationLiteral is a member of."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QEnumerationLiteral")][QString::fromLatin1("enumeration")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QEnumeration::ownedLiteral"); QInstanceSpecification::setPropertyData(); } -#include "moc_qenumerationliteral.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qenumerationliteral.cpp" diff --git a/src/uml/qenumerationliteral.h b/src/uml/qenumerationliteral.h index 80b76768..c7568640 100644 --- a/src/uml/qenumerationliteral.h +++ b/src/uml/qenumerationliteral.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QEnumerationLiteral : public QInstanceSpecification { Q_OBJECT - Q_PROPERTY(QEnumeration * classifier READ classifier STORED false) - Q_PROPERTY(QEnumeration * enumeration READ enumeration WRITE setEnumeration) + Q_PROPERTY(QtUml::QEnumeration * classifier READ classifier STORED false) + Q_PROPERTY(QtUml::QEnumeration * enumeration READ enumeration WRITE setEnumeration) Q_DISABLE_COPY(QEnumerationLiteral) Q_DECLARE_PRIVATE(QEnumerationLiteral) @@ -82,7 +85,9 @@ protected: explicit QEnumerationLiteral(QEnumerationLiteralPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qenumerationliteral_p.h b/src/uml/qenumerationliteral_p.h index 9f6b0146..c22488ff 100644 --- a/src/uml/qenumerationliteral_p.h +++ b/src/uml/qenumerationliteral_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QEnumeration *enumeration; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qevent.cpp b/src/uml/qevent.cpp index 1178c947..38a3b1d8 100644 --- a/src/uml/qevent.cpp +++ b/src/uml/qevent.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QEventPrivate::QEventPrivate() { @@ -83,7 +86,9 @@ void QEvent::setPropertyData() QPackageableElement::setPropertyData(); } -#include "moc_qevent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qevent.cpp" diff --git a/src/uml/qevent.h b/src/uml/qevent.h index 30e1eb44..d72885d1 100644 --- a/src/uml/qevent.h +++ b/src/uml/qevent.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QEvent(QEventPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qevent_p.h b/src/uml/qevent_p.h index ac4e8a00..a9ecfafd 100644 --- a/src/uml/qevent_p.h +++ b/src/uml/qevent_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexceptionhandler.cpp b/src/uml/qexceptionhandler.cpp index e953268c..d7e4d659 100644 --- a/src/uml/qexceptionhandler.cpp +++ b/src/uml/qexceptionhandler.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExceptionHandlerPrivate::QExceptionHandlerPrivate() : handlerBody(0), @@ -196,38 +199,40 @@ void QExceptionHandler::setExceptionInput(QObjectNode *exceptionInput) void QExceptionHandler::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A node that is executed if the handler satisfies an uncaught exception."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The kind of instances that the handler catches. If an exception occurs whose type is any of the classifiers in the set, the handler catches the exception and executes its body."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The node protected by the handler. The handler is examined if an exception propagates to the outside of the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExecutableNode::handler"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An object node within the handler body. When the handler catches an exception, the exception token is placed in this node, causing the body to execute."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A node that is executed if the handler satisfies an uncaught exception."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The kind of instances that the handler catches. If an exception occurs whose type is any of the classifiers in the set, the handler catches the exception and executes its body."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The node protected by the handler. The handler is examined if an exception propagates to the outside of the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("protectedNode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExecutableNode::handler"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An object node within the handler body. When the handler catches an exception, the exception token is placed in this node, causing the body to execute."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExceptionHandler")][QString::fromLatin1("exceptionInput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qexceptionhandler.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexceptionhandler.cpp" diff --git a/src/uml/qexceptionhandler.h b/src/uml/qexceptionhandler.h index 810a49e9..26694cd4 100644 --- a/src/uml/qexceptionhandler.h +++ b/src/uml/qexceptionhandler.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,10 +69,10 @@ class Q_UML_EXPORT QExceptionHandler : public QElement { Q_OBJECT - Q_PROPERTY(QExecutableNode * handlerBody READ handlerBody WRITE setHandlerBody) - Q_PROPERTY(QSet<QClassifier *> exceptionTypes READ exceptionTypes) - Q_PROPERTY(QExecutableNode * protectedNode READ protectedNode WRITE setProtectedNode) - Q_PROPERTY(QObjectNode * exceptionInput READ exceptionInput WRITE setExceptionInput) + Q_PROPERTY(QtUml::QExecutableNode * handlerBody READ handlerBody WRITE setHandlerBody) + Q_PROPERTY(QSet<QtUml::QClassifier *> exceptionTypes READ exceptionTypes) + Q_PROPERTY(QtUml::QExecutableNode * protectedNode READ protectedNode WRITE setProtectedNode) + Q_PROPERTY(QtUml::QObjectNode * exceptionInput READ exceptionInput WRITE setExceptionInput) Q_DISABLE_COPY(QExceptionHandler) Q_DECLARE_PRIVATE(QExceptionHandler) @@ -95,7 +98,9 @@ protected: explicit QExceptionHandler(QExceptionHandlerPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexceptionhandler_p.h b/src/uml/qexceptionhandler_p.h index f4ac8f9b..d5429525 100644 --- a/src/uml/qexceptionhandler_p.h +++ b/src/uml/qexceptionhandler_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,7 +78,9 @@ public: QObjectNode *exceptionInput; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutablenode.cpp b/src/uml/qexecutablenode.cpp index 7ff79a26..6b97f9f8 100644 --- a/src/uml/qexecutablenode.cpp +++ b/src/uml/qexecutablenode.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExecutableNodePrivate::QExecutableNodePrivate() { @@ -129,17 +132,19 @@ void QExecutableNode::removeHandler(QExceptionHandler *handler) void QExecutableNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of exception handlers that are examined if an uncaught exception propagates to the outer level of the executable node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExceptionHandler::protectedNode"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of exception handlers that are examined if an uncaught exception propagates to the outer level of the executable node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExceptionHandler::protectedNode"); QActivityNode::setPropertyData(); } -#include "moc_qexecutablenode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexecutablenode.cpp" diff --git a/src/uml/qexecutablenode.h b/src/uml/qexecutablenode.h index 18c2ac5c..eeb9dea5 100644 --- a/src/uml/qexecutablenode.h +++ b/src/uml/qexecutablenode.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QExecutableNode : public QActivityNode { Q_OBJECT - Q_PROPERTY(QSet<QExceptionHandler *> handlers READ handlers) + Q_PROPERTY(QSet<QtUml::QExceptionHandler *> handlers READ handlers) Q_DISABLE_COPY(QExecutableNode) Q_DECLARE_PRIVATE(QExecutableNode) @@ -84,7 +87,9 @@ protected: explicit QExecutableNode(QExecutableNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutablenode_p.h b/src/uml/qexecutablenode_p.h index 5d48c1ca..d643af81 100644 --- a/src/uml/qexecutablenode_p.h +++ b/src/uml/qexecutablenode_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QSet<QExceptionHandler *> handlers; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutionenvironment.cpp b/src/uml/qexecutionenvironment.cpp index 3a6d0ab7..7a691554 100644 --- a/src/uml/qexecutionenvironment.cpp +++ b/src/uml/qexecutionenvironment.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExecutionEnvironmentPrivate::QExecutionEnvironmentPrivate() { @@ -83,7 +86,9 @@ void QExecutionEnvironment::setPropertyData() QNode::setPropertyData(); } -#include "moc_qexecutionenvironment.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexecutionenvironment.cpp" diff --git a/src/uml/qexecutionenvironment.h b/src/uml/qexecutionenvironment.h index 38c65d8d..62108497 100644 --- a/src/uml/qexecutionenvironment.h +++ b/src/uml/qexecutionenvironment.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QExecutionEnvironment(QExecutionEnvironmentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutionenvironment_p.h b/src/uml/qexecutionenvironment_p.h index 7cae9ad5..b189ca42 100644 --- a/src/uml/qexecutionenvironment_p.h +++ b/src/uml/qexecutionenvironment_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QExecutionEnvironment; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutionoccurrencespecification.cpp b/src/uml/qexecutionoccurrencespecification.cpp index ebe0304a..a981a4e5 100644 --- a/src/uml/qexecutionoccurrencespecification.cpp +++ b/src/uml/qexecutionoccurrencespecification.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExecutionOccurrenceSpecificationPrivate::QExecutionOccurrenceSpecificationPrivate() : execution(0) @@ -108,17 +111,19 @@ void QExecutionOccurrenceSpecification::setExecution(QExecutionSpecification *ex void QExecutionOccurrenceSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the execution specification describing the execution that is started or finished at this execution event."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the execution specification describing the execution that is started or finished at this execution event."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QOccurrenceSpecification::setPropertyData(); } -#include "moc_qexecutionoccurrencespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexecutionoccurrencespecification.cpp" diff --git a/src/uml/qexecutionoccurrencespecification.h b/src/uml/qexecutionoccurrencespecification.h index 838ea672..01dfba68 100644 --- a/src/uml/qexecutionoccurrencespecification.h +++ b/src/uml/qexecutionoccurrencespecification.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QExecutionOccurrenceSpecification : public QOccurrenceSpecifi { Q_OBJECT - Q_PROPERTY(QExecutionSpecification * execution READ execution WRITE setExecution) + Q_PROPERTY(QtUml::QExecutionSpecification * execution READ execution WRITE setExecution) Q_DISABLE_COPY(QExecutionOccurrenceSpecification) Q_DECLARE_PRIVATE(QExecutionOccurrenceSpecification) @@ -80,7 +83,9 @@ protected: explicit QExecutionOccurrenceSpecification(QExecutionOccurrenceSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutionoccurrencespecification_p.h b/src/uml/qexecutionoccurrencespecification_p.h index cba69de5..7f7bda87 100644 --- a/src/uml/qexecutionoccurrencespecification_p.h +++ b/src/uml/qexecutionoccurrencespecification_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QExecutionSpecification *execution; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutionspecification.cpp b/src/uml/qexecutionspecification.cpp index 3dc33c8c..defa1ef8 100644 --- a/src/uml/qexecutionspecification.cpp +++ b/src/uml/qexecutionspecification.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExecutionSpecificationPrivate::QExecutionSpecificationPrivate() : start(0), @@ -130,24 +133,26 @@ void QExecutionSpecification::setFinish(QOccurrenceSpecification *finish) void QExecutionSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the OccurrenceSpecification that designates the start of the Action or Behavior"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the OccurrenceSpecification that designates the finish of the Action or Behavior."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the OccurrenceSpecification that designates the start of the Action or Behavior"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the OccurrenceSpecification that designates the finish of the Action or Behavior."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExecutionSpecification")][QString::fromLatin1("finish")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInteractionFragment::setPropertyData(); } -#include "moc_qexecutionspecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexecutionspecification.cpp" diff --git a/src/uml/qexecutionspecification.h b/src/uml/qexecutionspecification.h index 9715686b..a41ae137 100644 --- a/src/uml/qexecutionspecification.h +++ b/src/uml/qexecutionspecification.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QExecutionSpecification : public QInteractionFragment { Q_OBJECT - Q_PROPERTY(QOccurrenceSpecification * start READ start WRITE setStart) - Q_PROPERTY(QOccurrenceSpecification * finish READ finish WRITE setFinish) + Q_PROPERTY(QtUml::QOccurrenceSpecification * start READ start WRITE setStart) + Q_PROPERTY(QtUml::QOccurrenceSpecification * finish READ finish WRITE setFinish) Q_DISABLE_COPY(QExecutionSpecification) Q_DECLARE_PRIVATE(QExecutionSpecification) @@ -83,7 +86,9 @@ protected: explicit QExecutionSpecification(QExecutionSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexecutionspecification_p.h b/src/uml/qexecutionspecification_p.h index 42efd6cc..00b18041 100644 --- a/src/uml/qexecutionspecification_p.h +++ b/src/uml/qexecutionspecification_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOccurrenceSpecification *finish; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexpansionnode.cpp b/src/uml/qexpansionnode.cpp index 54ebca07..6f8e6890 100644 --- a/src/uml/qexpansionnode.cpp +++ b/src/uml/qexpansionnode.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExpansionNodePrivate::QExpansionNodePrivate() : regionAsOutput(0), @@ -146,24 +149,26 @@ void QExpansionNode::setRegionAsInput(QExpansionRegion *regionAsInput) void QExpansionNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The expansion region for which the node is an output."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionRegion::outputElement"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The expansion region for which the node is an input."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionRegion::inputElement"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The expansion region for which the node is an output."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionRegion::outputElement"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The expansion region for which the node is an input."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionNode")][QString::fromLatin1("regionAsInput")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionRegion::inputElement"); QObjectNode::setPropertyData(); } -#include "moc_qexpansionnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexpansionnode.cpp" diff --git a/src/uml/qexpansionnode.h b/src/uml/qexpansionnode.h index ead5f5c3..be6f0615 100644 --- a/src/uml/qexpansionnode.h +++ b/src/uml/qexpansionnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QExpansionNode : public QObjectNode { Q_OBJECT - Q_PROPERTY(QExpansionRegion * regionAsOutput READ regionAsOutput WRITE setRegionAsOutput) - Q_PROPERTY(QExpansionRegion * regionAsInput READ regionAsInput WRITE setRegionAsInput) + Q_PROPERTY(QtUml::QExpansionRegion * regionAsOutput READ regionAsOutput WRITE setRegionAsOutput) + Q_PROPERTY(QtUml::QExpansionRegion * regionAsInput READ regionAsInput WRITE setRegionAsInput) Q_DISABLE_COPY(QExpansionNode) Q_DECLARE_PRIVATE(QExpansionNode) @@ -83,7 +86,9 @@ protected: explicit QExpansionNode(QExpansionNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexpansionnode_p.h b/src/uml/qexpansionnode_p.h index 2a81b896..1cccd7de 100644 --- a/src/uml/qexpansionnode_p.h +++ b/src/uml/qexpansionnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QExpansionRegion *regionAsInput; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexpansionregion.cpp b/src/uml/qexpansionregion.cpp index 1f66c04c..464704cb 100644 --- a/src/uml/qexpansionregion.cpp +++ b/src/uml/qexpansionregion.cpp @@ -46,10 +46,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExpansionRegionPrivate::QExpansionRegionPrivate() : - mode(QtUml::ExpansionIterative) + mode(QtUmlNS::ExpansionIterative) { } @@ -88,7 +91,7 @@ QExpansionRegion::~QExpansionRegion() /*! The way in which the executions interact: parallel: all interactions are independent iterative: the interactions occur in order of the elements stream: a stream of values flows into a single execution */ -QtUml::ExpansionKind QExpansionRegion::mode() const +QtUmlNS::ExpansionKind QExpansionRegion::mode() const { // This is a read-write attribute @@ -96,7 +99,7 @@ QtUml::ExpansionKind QExpansionRegion::mode() const return d->mode; } -void QExpansionRegion::setMode(QtUml::ExpansionKind mode) +void QExpansionRegion::setMode(QtUmlNS::ExpansionKind mode) { // This is a read-write attribute @@ -109,7 +112,7 @@ void QExpansionRegion::setMode(QtUml::ExpansionKind mode) void QExpansionRegion::unsetMode() { - setMode(QtUml::ExpansionIterative); + setMode(QtUmlNS::ExpansionIterative); Q_D(QExpansionRegion); d->modifiedResettableProperties.removeAll(QString::fromLatin1("mode")); } @@ -194,31 +197,33 @@ void QExpansionRegion::removeOutputElement(QExpansionNode *outputElement) void QExpansionRegion::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The way in which the executions interact: parallel: all interactions are independent iterative: the interactions occur in order of the elements stream: a stream of values flows into a single execution"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An object node that holds a separate element of the input collection during each of the multiple executions of the region."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionNode::regionAsInput"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An object node that accepts a separate element of the output collection during each of the multiple executions of the region. The values are formed into a collection that is available when the execution of the region is complete."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionNode::regionAsOutput"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The way in which the executions interact: parallel: all interactions are independent iterative: the interactions occur in order of the elements stream: a stream of values flows into a single execution"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An object node that holds a separate element of the input collection during each of the multiple executions of the region."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("inputElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionNode::regionAsInput"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An object node that accepts a separate element of the output collection during each of the multiple executions of the region. The values are formed into a collection that is available when the execution of the region is complete."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpansionRegion")][QString::fromLatin1("outputElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExpansionNode::regionAsOutput"); QStructuredActivityNode::setPropertyData(); } -#include "moc_qexpansionregion.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexpansionregion.cpp" diff --git a/src/uml/qexpansionregion.h b/src/uml/qexpansionregion.h index e4225bcd..35b01856 100644 --- a/src/uml/qexpansionregion.h +++ b/src/uml/qexpansionregion.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,9 +70,9 @@ class Q_UML_EXPORT QExpansionRegion : public QStructuredActivityNode { Q_OBJECT - Q_PROPERTY(QtUml::ExpansionKind mode READ mode WRITE setMode RESET unsetMode) - Q_PROPERTY(QSet<QExpansionNode *> inputElements READ inputElements) - Q_PROPERTY(QSet<QExpansionNode *> outputElements READ outputElements) + Q_PROPERTY(QtUmlNS::ExpansionKind mode READ mode WRITE setMode RESET unsetMode) + Q_PROPERTY(QSet<QtUml::QExpansionNode *> inputElements READ inputElements) + Q_PROPERTY(QSet<QtUml::QExpansionNode *> outputElements READ outputElements) Q_DISABLE_COPY(QExpansionRegion) Q_DECLARE_PRIVATE(QExpansionRegion) @@ -79,8 +82,8 @@ public: virtual ~QExpansionRegion(); // Attributes from QExpansionRegion - Q_INVOKABLE QtUml::ExpansionKind mode() const; - Q_INVOKABLE void setMode(QtUml::ExpansionKind mode); + Q_INVOKABLE QtUmlNS::ExpansionKind mode() const; + Q_INVOKABLE void setMode(QtUmlNS::ExpansionKind mode); Q_INVOKABLE void unsetMode(); // Association ends from QExpansionRegion @@ -97,7 +100,9 @@ protected: explicit QExpansionRegion(QExpansionRegionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexpansionregion_p.h b/src/uml/qexpansionregion_p.h index 98e4e5e2..68219efc 100644 --- a/src/uml/qexpansionregion_p.h +++ b/src/uml/qexpansionregion_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,12 +73,14 @@ public: explicit QExpansionRegionPrivate(); virtual ~QExpansionRegionPrivate(); - QtUml::ExpansionKind mode; + QtUmlNS::ExpansionKind mode; QSet<QExpansionNode *> inputElements; QSet<QExpansionNode *> outputElements; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexpression.cpp b/src/uml/qexpression.cpp index 93089ddd..6c7983f0 100644 --- a/src/uml/qexpression.cpp +++ b/src/uml/qexpression.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExpressionPrivate::QExpressionPrivate() { @@ -146,24 +149,26 @@ void QExpression::removeOperand(QValueSpecification *operand) void QExpression::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The symbol associated with the node in the expression tree."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a sequence of operands."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The symbol associated with the node in the expression tree."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a sequence of operands."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExpression")][QString::fromLatin1("operands")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qexpression.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qexpression.cpp" diff --git a/src/uml/qexpression.h b/src/uml/qexpression.h index b1f59b21..57162c1d 100644 --- a/src/uml/qexpression.h +++ b/src/uml/qexpression.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,7 +66,7 @@ class Q_UML_EXPORT QExpression : public QValueSpecification Q_OBJECT Q_PROPERTY(QString symbol READ symbol WRITE setSymbol) - Q_PROPERTY(QList<QValueSpecification *> operands READ operands) + Q_PROPERTY(QList<QtUml::QValueSpecification *> operands READ operands) Q_DISABLE_COPY(QExpression) Q_DECLARE_PRIVATE(QExpression) @@ -87,7 +90,9 @@ protected: explicit QExpression(QExpressionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qexpression_p.h b/src/uml/qexpression_p.h index 708b0db2..abbf146e 100644 --- a/src/uml/qexpression_p.h +++ b/src/uml/qexpression_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QExpression; @@ -69,7 +72,9 @@ public: QList<QValueSpecification *> operands; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextend.cpp b/src/uml/qextend.cpp index 9b79e7ff..68384106 100644 --- a/src/uml/qextend.cpp +++ b/src/uml/qextend.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExtendPrivate::QExtendPrivate() : extendedCase(0), @@ -179,12 +182,12 @@ void QExtend::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QExtend::visibility() const +QtUmlNS::VisibilityKind QExtend::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QExtend::setVisibility(QtUml::VisibilityKind visibility) +void QExtend::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -373,38 +376,40 @@ void QExtend::setCondition(QConstraint *condition) void QExtend::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that is being extended."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that represents the extension and owns the extend relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::extend"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An ordered list of extension points belonging to the extended use case, specifying where the respective behavioral fragments of the extending use case are to be inserted. The first fragment in the extending use case is associated with the first extension point in the list, the second fragment with the second point, and so on. (Note that, in most practical cases, the extending use case has just a single behavior fragment, so that the list of extension points is trivial.)"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the condition that must hold when the first extension point is reached for the extension to take place. If no constraint is associated with the extend relationship, the extension is unconditional."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that is being extended."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that represents the extension and owns the extend relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extension")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::extend"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An ordered list of extension points belonging to the extended use case, specifying where the respective behavioral fragments of the extending use case are to be inserted. The first fragment in the extending use case is associated with the first extension point in the list, the second fragment with the second point, and so on. (Note that, in most practical cases, the extending use case has just a single behavior fragment, so that the list of extension points is trivial.)"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("extensionLocations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the condition that must hold when the first extension point is reached for the extension to take place. If no constraint is associated with the extend relationship, the extension is unconditional."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtend")][QString::fromLatin1("condition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qextend.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qextend.cpp" diff --git a/src/uml/qextend.h b/src/uml/qextend.h index 1c9cbfe9..62ea5b31 100644 --- a/src/uml/qextend.h +++ b/src/uml/qextend.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,26 +71,26 @@ class Q_UML_EXPORT QExtend : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtUml::QElement *> relatedElements READ relatedElements) - Q_PROPERTY(QSet<QElement *> sources READ sources) - Q_PROPERTY(QSet<QElement *> targets READ targets) + Q_PROPERTY(QSet<QtUml::QElement *> sources READ sources) + Q_PROPERTY(QSet<QtUml::QElement *> targets READ targets) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QUseCase * extendedCase READ extendedCase WRITE setExtendedCase) - Q_PROPERTY(QUseCase * extension READ extension WRITE setExtension) - Q_PROPERTY(QList<QExtensionPoint *> extensionLocations READ extensionLocations) - Q_PROPERTY(QConstraint * condition READ condition WRITE setCondition) + Q_PROPERTY(QtUml::QUseCase * extendedCase READ extendedCase WRITE setExtendedCase) + Q_PROPERTY(QtUml::QUseCase * extension READ extension WRITE setExtension) + Q_PROPERTY(QList<QtUml::QExtensionPoint *> extensionLocations READ extensionLocations) + Q_PROPERTY(QtUml::QConstraint * condition READ condition WRITE setCondition) Q_DISABLE_COPY(QExtend) Q_DECLARE_PRIVATE(QExtend) @@ -113,8 +116,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -146,7 +149,9 @@ private: QNamedElement *_wrappedNamedElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextend_p.h b/src/uml/qextend_p.h index 1df24bb0..3c813f98 100644 --- a/src/uml/qextend_p.h +++ b/src/uml/qextend_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ public: QConstraint *condition; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextension.cpp b/src/uml/qextension.cpp index 9b93bdac..9bb6a2c9 100644 --- a/src/uml/qextension.cpp +++ b/src/uml/qextension.cpp @@ -50,7 +50,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExtensionPrivate::QExtensionPrivate() : ownedEnd(0) @@ -182,31 +185,33 @@ QProperty *QExtension::metaclassEnd() const void QExtension::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether an instance of the extending stereotype must be created when an instance of the extended class is created. The attribute value is derived from the value of the lower property of the ExtensionEnd referenced by Extension::ownedEnd; a lower value of 1 means that isRequired is true, but otherwise it is false. Since the default value of ExtensionEnd::lower is 0, the default value of isRequired is false."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Class that is extended through an Extension. The property is derived from the type of the memberEnd that is not the ownedEnd."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::extension"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the end of the extension that is typed by a Stereotype."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QAssociation::ownedEnds"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether an instance of the extending stereotype must be created when an instance of the extended class is created. The attribute value is derived from the value of the lower property of the ExtensionEnd referenced by Extension::ownedEnd; a lower value of 1 means that isRequired is true, but otherwise it is false. Since the default value of ExtensionEnd::lower is 0, the default value of isRequired is false."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Class that is extended through an Extension. The property is derived from the type of the memberEnd that is not the ownedEnd."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("metaclass")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::extension"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the end of the extension that is typed by a Stereotype."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QAssociation::ownedEnds"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtension")][QString::fromLatin1("ownedEnd")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAssociation::setPropertyData(); } -#include "moc_qextension.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qextension.cpp" diff --git a/src/uml/qextension.h b/src/uml/qextension.h index e1686c21..e0f78d22 100644 --- a/src/uml/qextension.h +++ b/src/uml/qextension.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,8 +67,8 @@ class Q_UML_EXPORT QExtension : public QAssociation Q_OBJECT Q_PROPERTY(bool isRequired READ isRequired STORED false) - Q_PROPERTY(QClass * metaclass READ metaclass STORED false) - Q_PROPERTY(QExtensionEnd * ownedEnd READ ownedEnd WRITE setOwnedEnd) + Q_PROPERTY(QtUml::QClass * metaclass READ metaclass STORED false) + Q_PROPERTY(QtUml::QExtensionEnd * ownedEnd READ ownedEnd WRITE setOwnedEnd) Q_DISABLE_COPY(QExtension) Q_DECLARE_PRIVATE(QExtension) @@ -94,7 +97,9 @@ protected: explicit QExtension(QExtensionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextension_p.h b/src/uml/qextension_p.h index 2a50431b..8735923e 100644 --- a/src/uml/qextension_p.h +++ b/src/uml/qextension_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: void setMetaclass(QClass *metaclass); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextensionend.cpp b/src/uml/qextensionend.cpp index 1d165679..2faf6ab5 100644 --- a/src/uml/qextensionend.cpp +++ b/src/uml/qextensionend.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExtensionEndPrivate::QExtensionEndPrivate() : type(0) @@ -152,24 +155,26 @@ qint32 QExtensionEnd::lowerBound() const void QExtensionEnd::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This redefinition changes the default multiplicity of association ends, since model elements are usually extended by 0 or 1 instance of the extension stereotype."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QMultiplicityElement::lower"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the type of the ExtensionEnd. Note that this association restricts the possible types of an ExtensionEnd to only be Stereotypes."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTypedElement::type"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This redefinition changes the default multiplicity of association ends, since model elements are usually extended by 0 or 1 instance of the extension stereotype."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QMultiplicityElement::lower"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the type of the ExtensionEnd. Note that this association restricts the possible types of an ExtensionEnd to only be Stereotypes."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTypedElement::type"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionEnd")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QProperty::setPropertyData(); } -#include "moc_qextensionend.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qextensionend.cpp" diff --git a/src/uml/qextensionend.h b/src/uml/qextensionend.h index f53e0661..3844d95d 100644 --- a/src/uml/qextensionend.h +++ b/src/uml/qextensionend.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QExtensionEnd : public QProperty Q_OBJECT Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QStereotype * type READ type WRITE setType) + Q_PROPERTY(QtUml::QStereotype * type READ type WRITE setType) Q_DISABLE_COPY(QExtensionEnd) Q_DECLARE_PRIVATE(QExtensionEnd) @@ -88,7 +91,9 @@ protected: explicit QExtensionEnd(QExtensionEndPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextensionend_p.h b/src/uml/qextensionend_p.h index 70ed1a6a..4cf8b929 100644 --- a/src/uml/qextensionend_p.h +++ b/src/uml/qextensionend_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QStereotype *type; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextensionpoint.cpp b/src/uml/qextensionpoint.cpp index 949ad044..3ba7a7d2 100644 --- a/src/uml/qextensionpoint.cpp +++ b/src/uml/qextensionpoint.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QExtensionPointPrivate::QExtensionPointPrivate() : useCase(0) @@ -119,17 +122,19 @@ void QExtensionPoint::setUseCase(QUseCase *useCase) void QExtensionPoint::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that owns this extension point."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::extensionPoint"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that owns this extension point."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::extensionPoint"); QRedefinableElement::setPropertyData(); } -#include "moc_qextensionpoint.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qextensionpoint.cpp" diff --git a/src/uml/qextensionpoint.h b/src/uml/qextensionpoint.h index c92c6b94..0d606284 100644 --- a/src/uml/qextensionpoint.h +++ b/src/uml/qextensionpoint.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QExtensionPoint : public QRedefinableElement { Q_OBJECT - Q_PROPERTY(QUseCase * useCase READ useCase WRITE setUseCase) + Q_PROPERTY(QtUml::QUseCase * useCase READ useCase WRITE setUseCase) Q_DISABLE_COPY(QExtensionPoint) Q_DECLARE_PRIVATE(QExtensionPoint) @@ -80,7 +83,9 @@ protected: explicit QExtensionPoint(QExtensionPointPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qextensionpoint_p.h b/src/uml/qextensionpoint_p.h index 41064b34..e0c82951 100644 --- a/src/uml/qextensionpoint_p.h +++ b/src/uml/qextensionpoint_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QUseCase *useCase; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfeature.cpp b/src/uml/qfeature.cpp index 309b2b1d..9b253fa0 100644 --- a/src/uml/qfeature.cpp +++ b/src/uml/qfeature.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QFeaturePrivate::QFeaturePrivate() : isStatic(false) @@ -160,24 +163,26 @@ QSet<QClassifier *> QFeature::featuringClassifiers() const void QFeature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether this feature characterizes individual instances classified by the classifier (false) or the classifier itself (true)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Classifiers that have this Feature as a feature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::feature"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether this feature characterizes individual instances classified by the classifier (false) or the classifier itself (true)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Classifiers that have this Feature as a feature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QFeature")][QString::fromLatin1("featuringClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::feature"); QRedefinableElement::setPropertyData(); } -#include "moc_qfeature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qfeature.cpp" diff --git a/src/uml/qfeature.h b/src/uml/qfeature.h index 0bc1c0e2..89b1736b 100644 --- a/src/uml/qfeature.h +++ b/src/uml/qfeature.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,7 +68,7 @@ class Q_UML_EXPORT QFeature : public QRedefinableElement Q_OBJECT Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtUml::QClassifier *> featuringClassifiers READ featuringClassifiers) Q_DISABLE_COPY(QFeature) Q_DECLARE_PRIVATE(QFeature) @@ -91,7 +94,9 @@ protected: explicit QFeature(QFeaturePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfeature_p.h b/src/uml/qfeature_p.h index 8cf7db8e..8d178ab8 100644 --- a/src/uml/qfeature_p.h +++ b/src/uml/qfeature_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: void removeFeaturingClassifier(QClassifier *featuringClassifier); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfinalnode.cpp b/src/uml/qfinalnode.cpp index ff4d3cc2..8577516f 100644 --- a/src/uml/qfinalnode.cpp +++ b/src/uml/qfinalnode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QFinalNodePrivate::QFinalNodePrivate() { @@ -83,7 +86,9 @@ void QFinalNode::setPropertyData() QControlNode::setPropertyData(); } -#include "moc_qfinalnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qfinalnode.cpp" diff --git a/src/uml/qfinalnode.h b/src/uml/qfinalnode.h index b23ba298..1e1298cf 100644 --- a/src/uml/qfinalnode.h +++ b/src/uml/qfinalnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QFinalNode(QFinalNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfinalnode_p.h b/src/uml/qfinalnode_p.h index b44fd8fc..b5698048 100644 --- a/src/uml/qfinalnode_p.h +++ b/src/uml/qfinalnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfinalstate.cpp b/src/uml/qfinalstate.cpp index 9628ed5b..07f748bf 100644 --- a/src/uml/qfinalstate.cpp +++ b/src/uml/qfinalstate.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QFinalStatePrivate::QFinalStatePrivate() { @@ -83,7 +86,9 @@ void QFinalState::setPropertyData() QState::setPropertyData(); } -#include "moc_qfinalstate.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qfinalstate.cpp" diff --git a/src/uml/qfinalstate.h b/src/uml/qfinalstate.h index 82dd25f0..db713930 100644 --- a/src/uml/qfinalstate.h +++ b/src/uml/qfinalstate.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QFinalState(QFinalStatePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfinalstate_p.h b/src/uml/qfinalstate_p.h index 89262617..4b532b41 100644 --- a/src/uml/qfinalstate_p.h +++ b/src/uml/qfinalstate_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QFinalState; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qflowfinalnode.cpp b/src/uml/qflowfinalnode.cpp index 2ac6d1f3..357ab9f3 100644 --- a/src/uml/qflowfinalnode.cpp +++ b/src/uml/qflowfinalnode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QFlowFinalNodePrivate::QFlowFinalNodePrivate() { @@ -83,7 +86,9 @@ void QFlowFinalNode::setPropertyData() QFinalNode::setPropertyData(); } -#include "moc_qflowfinalnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qflowfinalnode.cpp" diff --git a/src/uml/qflowfinalnode.h b/src/uml/qflowfinalnode.h index b4fc9631..1bf6d076 100644 --- a/src/uml/qflowfinalnode.h +++ b/src/uml/qflowfinalnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QFlowFinalNode(QFlowFinalNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qflowfinalnode_p.h b/src/uml/qflowfinalnode_p.h index 5ccd17e5..fac14f80 100644 --- a/src/uml/qflowfinalnode_p.h +++ b/src/uml/qflowfinalnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QFlowFinalNode; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qforknode.cpp b/src/uml/qforknode.cpp index 0275dd9c..504aae25 100644 --- a/src/uml/qforknode.cpp +++ b/src/uml/qforknode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QForkNodePrivate::QForkNodePrivate() { @@ -83,7 +86,9 @@ void QForkNode::setPropertyData() QControlNode::setPropertyData(); } -#include "moc_qforknode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qforknode.cpp" diff --git a/src/uml/qforknode.h b/src/uml/qforknode.h index a131dd16..cb0370e5 100644 --- a/src/uml/qforknode.h +++ b/src/uml/qforknode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QForkNode(QForkNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qforknode_p.h b/src/uml/qforknode_p.h index 83fe0b2e..918bcc64 100644 --- a/src/uml/qforknode_p.h +++ b/src/uml/qforknode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QForkNode; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfunctionbehavior.cpp b/src/uml/qfunctionbehavior.cpp index b5a31544..eab41018 100644 --- a/src/uml/qfunctionbehavior.cpp +++ b/src/uml/qfunctionbehavior.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QFunctionBehaviorPrivate::QFunctionBehaviorPrivate() { @@ -83,7 +86,9 @@ void QFunctionBehavior::setPropertyData() QOpaqueBehavior::setPropertyData(); } -#include "moc_qfunctionbehavior.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qfunctionbehavior.cpp" diff --git a/src/uml/qfunctionbehavior.h b/src/uml/qfunctionbehavior.h index 5d049367..b0f59485 100644 --- a/src/uml/qfunctionbehavior.h +++ b/src/uml/qfunctionbehavior.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QFunctionBehavior(QFunctionBehaviorPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qfunctionbehavior_p.h b/src/uml/qfunctionbehavior_p.h index f45b35f1..34735a9b 100644 --- a/src/uml/qfunctionbehavior_p.h +++ b/src/uml/qfunctionbehavior_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QFunctionBehavior; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgate.cpp b/src/uml/qgate.cpp index 0243e617..48c3891e 100644 --- a/src/uml/qgate.cpp +++ b/src/uml/qgate.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QGatePrivate::QGatePrivate() { @@ -83,7 +86,9 @@ void QGate::setPropertyData() QMessageEnd::setPropertyData(); } -#include "moc_qgate.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qgate.cpp" diff --git a/src/uml/qgate.h b/src/uml/qgate.h index 5e97e7b6..e0ac76d7 100644 --- a/src/uml/qgate.h +++ b/src/uml/qgate.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QGate(QGatePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgate_p.h b/src/uml/qgate_p.h index e3d13bed..4f75d846 100644 --- a/src/uml/qgate_p.h +++ b/src/uml/qgate_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QGate; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgeneralization.cpp b/src/uml/qgeneralization.cpp index d77f2bef..e4da1db1 100644 --- a/src/uml/qgeneralization.cpp +++ b/src/uml/qgeneralization.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QGeneralizationPrivate::QGeneralizationPrivate() : isSubstitutable(true), @@ -228,38 +231,40 @@ void QGeneralization::setGeneral(QClassifier *general) void QGeneralization::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether the specific classifier can be used wherever the general classifier can be used. If true, the execution traces of the specific classifier will be a superset of the execution traces of the general classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the specializing classifier in the Generalization relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::generalization"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates a set in which instances of Generalization is considered members."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralizationSet::generalization"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the general classifier in the Generalization relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether the specific classifier can be used wherever the general classifier can be used. If true, the execution traces of the specific classifier will be a superset of the execution traces of the general classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the specializing classifier in the Generalization relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("specific")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::generalization"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates a set in which instances of Generalization is considered members."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("generalizationSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralizationSet::generalization"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the general classifier in the Generalization relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralization")][QString::fromLatin1("general")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDirectedRelationship::setPropertyData(); } -#include "moc_qgeneralization.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qgeneralization.cpp" diff --git a/src/uml/qgeneralization.h b/src/uml/qgeneralization.h index 344543fb..68a48408 100644 --- a/src/uml/qgeneralization.h +++ b/src/uml/qgeneralization.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QGeneralization : public QDirectedRelationship Q_OBJECT Q_PROPERTY(bool isSubstitutable READ isSubstitutable WRITE setSubstitutable RESET unsetSubstitutable) - Q_PROPERTY(QClassifier * specific READ specific WRITE setSpecific) - Q_PROPERTY(QSet<QGeneralizationSet *> generalizationSets READ generalizationSets) - Q_PROPERTY(QClassifier * general READ general WRITE setGeneral) + Q_PROPERTY(QtUml::QClassifier * specific READ specific WRITE setSpecific) + Q_PROPERTY(QSet<QtUml::QGeneralizationSet *> generalizationSets READ generalizationSets) + Q_PROPERTY(QtUml::QClassifier * general READ general WRITE setGeneral) Q_DISABLE_COPY(QGeneralization) Q_DECLARE_PRIVATE(QGeneralization) @@ -97,7 +100,9 @@ protected: explicit QGeneralization(QGeneralizationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgeneralization_p.h b/src/uml/qgeneralization_p.h index 95a8feaf..4a3dc10d 100644 --- a/src/uml/qgeneralization_p.h +++ b/src/uml/qgeneralization_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QClassifier *general; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgeneralizationset.cpp b/src/uml/qgeneralizationset.cpp index 7b39a491..15633147 100644 --- a/src/uml/qgeneralizationset.cpp +++ b/src/uml/qgeneralizationset.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QGeneralizationSetPrivate::QGeneralizationSetPrivate() : isCovering(false), @@ -219,38 +222,40 @@ void QGeneralizationSet::removeGeneralization(QGeneralization *generalization) void QGeneralizationSet::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates (via the associated Generalizations) whether or not the set of specific Classifiers are covering for a particular general classifier. When isCovering is true, every instance of a particular general Classifier is also an instance of at least one of its specific Classifiers for the GeneralizationSet. When isCovering is false, there are one or more instances of the particular general Classifier that are not instances of at least one of its specific Classifiers defined for the GeneralizationSet."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether or not the set of specific Classifiers in a Generalization relationship have instance in common. If isDisjoint is true, the specific Classifiers for a particular GeneralizationSet have no members in common; that is, their intersection is empty. If isDisjoint is false, the specific Classifiers in a particular GeneralizationSet have one or more members in common; that is, their intersection is not empty. For example, Person could have two Generalization relationships, each with the different specific Classifier: Manager or Staff. This would be disjoint because every instance of Person must either be a Manager or Staff. In contrast, Person could have two Generalization relationships involving two specific (and non-covering) Classifiers: Sales Person and Manager. This GeneralizationSet would not be disjoint because there are instances of Person which can be a Sales Person and a Manager."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the Classifier that is defined as the power type for the associated GeneralizationSet."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::powertypeExtent"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the instances of Generalization which are members of a given GeneralizationSet."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralization::generalizationSet"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates (via the associated Generalizations) whether or not the set of specific Classifiers are covering for a particular general classifier. When isCovering is true, every instance of a particular general Classifier is also an instance of at least one of its specific Classifiers for the GeneralizationSet. When isCovering is false, there are one or more instances of the particular general Classifier that are not instances of at least one of its specific Classifiers defined for the GeneralizationSet."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether or not the set of specific Classifiers in a Generalization relationship have instance in common. If isDisjoint is true, the specific Classifiers for a particular GeneralizationSet have no members in common; that is, their intersection is empty. If isDisjoint is false, the specific Classifiers in a particular GeneralizationSet have one or more members in common; that is, their intersection is not empty. For example, Person could have two Generalization relationships, each with the different specific Classifier: Manager or Staff. This would be disjoint because every instance of Person must either be a Manager or Staff. In contrast, Person could have two Generalization relationships involving two specific (and non-covering) Classifiers: Sales Person and Manager. This GeneralizationSet would not be disjoint because there are instances of Person which can be a Sales Person and a Manager."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("isDisjoint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the Classifier that is defined as the power type for the associated GeneralizationSet."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("powertype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::powertypeExtent"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the instances of Generalization which are members of a given GeneralizationSet."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralizationSet")][QString::fromLatin1("generalizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralization::generalizationSet"); QPackageableElement::setPropertyData(); } -#include "moc_qgeneralizationset.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qgeneralizationset.cpp" diff --git a/src/uml/qgeneralizationset.h b/src/uml/qgeneralizationset.h index 1c9d04fe..f81a6432 100644 --- a/src/uml/qgeneralizationset.h +++ b/src/uml/qgeneralizationset.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,8 +70,8 @@ class Q_UML_EXPORT QGeneralizationSet : public QPackageableElement Q_PROPERTY(bool isCovering READ isCovering WRITE setCovering RESET unsetCovering) Q_PROPERTY(bool isDisjoint READ isDisjoint WRITE setDisjoint RESET unsetDisjoint) - Q_PROPERTY(QClassifier * powertype READ powertype WRITE setPowertype) - Q_PROPERTY(QSet<QGeneralization *> generalizations READ generalizations) + Q_PROPERTY(QtUml::QClassifier * powertype READ powertype WRITE setPowertype) + Q_PROPERTY(QSet<QtUml::QGeneralization *> generalizations READ generalizations) Q_DISABLE_COPY(QGeneralizationSet) Q_DECLARE_PRIVATE(QGeneralizationSet) @@ -98,7 +101,9 @@ protected: explicit QGeneralizationSet(QGeneralizationSetPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgeneralizationset_p.h b/src/uml/qgeneralizationset_p.h index 70ab1efa..830a0b3c 100644 --- a/src/uml/qgeneralizationset_p.h +++ b/src/uml/qgeneralizationset_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QSet<QGeneralization *> generalizations; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgeneralordering.cpp b/src/uml/qgeneralordering.cpp index 93a347cd..18697787 100644 --- a/src/uml/qgeneralordering.cpp +++ b/src/uml/qgeneralordering.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QGeneralOrderingPrivate::QGeneralOrderingPrivate() : before(0), @@ -146,24 +149,26 @@ void QGeneralOrdering::setAfter(QOccurrenceSpecification *after) void QGeneralOrdering::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The OccurrenceSpecification referenced comes before the OccurrenceSpecification referenced by after."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOccurrenceSpecification::toAfter"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The OccurrenceSpecification referenced comes after the OccurrenceSpecification referenced by before."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOccurrenceSpecification::toBefore"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The OccurrenceSpecification referenced comes before the OccurrenceSpecification referenced by after."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOccurrenceSpecification::toAfter"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The OccurrenceSpecification referenced comes after the OccurrenceSpecification referenced by before."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QGeneralOrdering")][QString::fromLatin1("after")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOccurrenceSpecification::toBefore"); QNamedElement::setPropertyData(); } -#include "moc_qgeneralordering.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qgeneralordering.cpp" diff --git a/src/uml/qgeneralordering.h b/src/uml/qgeneralordering.h index 4eadb541..ac0f6659 100644 --- a/src/uml/qgeneralordering.h +++ b/src/uml/qgeneralordering.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QGeneralOrdering : public QNamedElement { Q_OBJECT - Q_PROPERTY(QOccurrenceSpecification * before READ before WRITE setBefore) - Q_PROPERTY(QOccurrenceSpecification * after READ after WRITE setAfter) + Q_PROPERTY(QtUml::QOccurrenceSpecification * before READ before WRITE setBefore) + Q_PROPERTY(QtUml::QOccurrenceSpecification * after READ after WRITE setAfter) Q_DISABLE_COPY(QGeneralOrdering) Q_DECLARE_PRIVATE(QGeneralOrdering) @@ -83,7 +86,9 @@ protected: explicit QGeneralOrdering(QGeneralOrderingPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qgeneralordering_p.h b/src/uml/qgeneralordering_p.h index 0ce0da7e..6cd41bc2 100644 --- a/src/uml/qgeneralordering_p.h +++ b/src/uml/qgeneralordering_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QOccurrenceSpecification *after; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qimage.cpp b/src/uml/qimage.cpp index 2fa2edb3..cbf51b78 100644 --- a/src/uml/qimage.cpp +++ b/src/uml/qimage.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QImagePrivate::QImagePrivate() { @@ -147,31 +150,33 @@ void QImage::setContent(QString content) void QImage::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("format")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("format")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("format")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This indicates the format of the content - which is how the string content should be interpreted. The following values are reserved: SVG, GIF, PNG, JPG, WMF, EMF, BMP. In addition the prefix 'MIME: ' is also reserved. This option can be used as an alternative to express the reserved values above, for example \"SVG\" could instead be expressed as \"MIME: image/svg+xml\"."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("format")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("format")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("format")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("location")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("location")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("location")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This contains a location that can be used by a tool to locate the image as an alternative to embedding it in the stereotype."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("location")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("location")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("location")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("content")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("content")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("content")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This contains the serialization of the image according to the format. The value could represent a bitmap, image such as a GIF file, or drawing 'instructions' using a standard such as Scalable Vector Graphic (SVG) (which is XML based)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("content")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("content")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("content")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("format")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("format")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("format")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This indicates the format of the content - which is how the string content should be interpreted. The following values are reserved: SVG, GIF, PNG, JPG, WMF, EMF, BMP. In addition the prefix 'MIME: ' is also reserved. This option can be used as an alternative to express the reserved values above, for example \"SVG\" could instead be expressed as \"MIME: image/svg+xml\"."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("format")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("format")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("format")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("location")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("location")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("location")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This contains a location that can be used by a tool to locate the image as an alternative to embedding it in the stereotype."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("location")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("location")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("location")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("content")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("content")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("content")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This contains the serialization of the image according to the format. The value could represent a bitmap, image such as a GIF file, or drawing 'instructions' using a standard such as Scalable Vector Graphic (SVG) (which is XML based)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("content")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("content")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QImage")][QString::fromLatin1("content")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qimage.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qimage.cpp" diff --git a/src/uml/qimage.h b/src/uml/qimage.h index e87e543c..67fc5145 100644 --- a/src/uml/qimage.h +++ b/src/uml/qimage.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -86,7 +89,9 @@ protected: explicit QImage(QImagePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qimage_p.h b/src/uml/qimage_p.h index 24708606..3e8eca65 100644 --- a/src/uml/qimage_p.h +++ b/src/uml/qimage_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QImage; @@ -69,7 +72,9 @@ public: QString content; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinclude.cpp b/src/uml/qinclude.cpp index e47d4a43..752dd790 100644 --- a/src/uml/qinclude.cpp +++ b/src/uml/qinclude.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QIncludePrivate::QIncludePrivate() : includingCase(0), @@ -176,12 +179,12 @@ void QInclude::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QInclude::visibility() const +QtUmlNS::VisibilityKind QInclude::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QInclude::setVisibility(QtUml::VisibilityKind visibility) +void QInclude::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -310,24 +313,26 @@ void QInclude::setAddition(QUseCase *addition) void QInclude::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case which will include the addition and owns the include relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::include"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that is to be included."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case which will include the addition and owns the include relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QUseCase::include"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the use case that is to be included."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInclude")][QString::fromLatin1("addition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qinclude.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinclude.cpp" diff --git a/src/uml/qinclude.h b/src/uml/qinclude.h index c662d5ec..57098c9e 100644 --- a/src/uml/qinclude.h +++ b/src/uml/qinclude.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,24 +66,24 @@ class Q_UML_EXPORT QInclude : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtUml::QElement *> relatedElements READ relatedElements) - Q_PROPERTY(QSet<QElement *> sources READ sources) - Q_PROPERTY(QSet<QElement *> targets READ targets) + Q_PROPERTY(QSet<QtUml::QElement *> sources READ sources) + Q_PROPERTY(QSet<QtUml::QElement *> targets READ targets) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QUseCase * includingCase READ includingCase WRITE setIncludingCase) - Q_PROPERTY(QUseCase * addition READ addition WRITE setAddition) + Q_PROPERTY(QtUml::QUseCase * includingCase READ includingCase WRITE setIncludingCase) + Q_PROPERTY(QtUml::QUseCase * addition READ addition WRITE setAddition) Q_DISABLE_COPY(QInclude) Q_DECLARE_PRIVATE(QInclude) @@ -106,8 +109,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -134,7 +137,9 @@ private: QNamedElement *_wrappedNamedElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinclude_p.h b/src/uml/qinclude_p.h index da379fa9..45fdf2e0 100644 --- a/src/uml/qinclude_p.h +++ b/src/uml/qinclude_p.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QUseCase *addition; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinformationflow.cpp b/src/uml/qinformationflow.cpp index 16c4833e..f91036ec 100644 --- a/src/uml/qinformationflow.cpp +++ b/src/uml/qinformationflow.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInformationFlowPrivate::QInformationFlowPrivate() { @@ -264,19 +267,19 @@ void QInformationFlow::removeClientDependency(QDependency *clientDependency) /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QInformationFlow::visibility() const +QtUmlNS::VisibilityKind QInformationFlow::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QInformationFlow::setVisibility(QtUml::VisibilityKind visibility) +void QInformationFlow::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QInformationFlow::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QInformationFlow); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -516,59 +519,61 @@ void QInformationFlow::removeRealization(QRelationship *realization) void QInformationFlow::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Defines to which target the conveyed InformationItems are directed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which Connectors will realize the specified flow."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the information items that may circulate on this information flow."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Defines from which source the conveyed InformationItems are initiated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which Messages will realize the specified flow."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which ActivityEdges will realize the specified flow."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which Relationship will realize the specified flow"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Defines to which target the conveyed InformationItems are directed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which Connectors will realize the specified flow."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingConnectors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the information items that may circulate on this information flow."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("conveyed")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Defines from which source the conveyed InformationItems are initiated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("informationSources")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which Messages will realize the specified flow."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingMessages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which ActivityEdges will realize the specified flow."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizingActivityEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines which Relationship will realize the specified flow"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationFlow")][QString::fromLatin1("realizations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qinformationflow.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinformationflow.cpp" diff --git a/src/uml/qinformationflow.h b/src/uml/qinformationflow.h index 71a4567f..9e52b97f 100644 --- a/src/uml/qinformationflow.h +++ b/src/uml/qinformationflow.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,33 +74,33 @@ class Q_UML_EXPORT QInformationFlow : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtUml::QElement *> relatedElements READ relatedElements) - Q_PROPERTY(QSet<QElement *> sources READ sources) - Q_PROPERTY(QSet<QElement *> targets READ targets) + Q_PROPERTY(QSet<QtUml::QElement *> sources READ sources) + Q_PROPERTY(QSet<QtUml::QElement *> targets READ targets) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QSet<QNamedElement *> informationTargets READ informationTargets) - Q_PROPERTY(QSet<QConnector *> realizingConnectors READ realizingConnectors) - Q_PROPERTY(QSet<QClassifier *> conveyed READ conveyed) - Q_PROPERTY(QSet<QNamedElement *> informationSources READ informationSources) - Q_PROPERTY(QSet<QMessage *> realizingMessages READ realizingMessages) - Q_PROPERTY(QSet<QActivityEdge *> realizingActivityEdges READ realizingActivityEdges) - Q_PROPERTY(QSet<QRelationship *> realizations READ realizations) + Q_PROPERTY(QSet<QtUml::QNamedElement *> informationTargets READ informationTargets) + Q_PROPERTY(QSet<QtUml::QConnector *> realizingConnectors READ realizingConnectors) + Q_PROPERTY(QSet<QtUml::QClassifier *> conveyed READ conveyed) + Q_PROPERTY(QSet<QtUml::QNamedElement *> informationSources READ informationSources) + Q_PROPERTY(QSet<QtUml::QMessage *> realizingMessages READ realizingMessages) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> realizingActivityEdges READ realizingActivityEdges) + Q_PROPERTY(QSet<QtUml::QRelationship *> realizations READ realizations) Q_DISABLE_COPY(QInformationFlow) Q_DECLARE_PRIVATE(QInformationFlow) @@ -140,8 +143,8 @@ public: Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from QInformationFlow @@ -177,7 +180,9 @@ private: QPackageableElement *_wrappedPackageableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinformationflow_p.h b/src/uml/qinformationflow_p.h index 3acc09a7..a6d12f48 100644 --- a/src/uml/qinformationflow_p.h +++ b/src/uml/qinformationflow_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -83,7 +86,9 @@ public: QSet<QRelationship *> realizations; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinformationitem.cpp b/src/uml/qinformationitem.cpp index 8cf04326..8db952cd 100644 --- a/src/uml/qinformationitem.cpp +++ b/src/uml/qinformationitem.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInformationItemPrivate::QInformationItemPrivate() { @@ -115,17 +118,19 @@ void QInformationItem::removeRepresented(QClassifier *represented) void QInformationItem::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines the classifiers that will specify the structure and nature of the information. An information item represents all its represented classifiers."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines the classifiers that will specify the structure and nature of the information. An information item represents all its represented classifiers."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClassifier::setPropertyData(); } -#include "moc_qinformationitem.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinformationitem.cpp" diff --git a/src/uml/qinformationitem.h b/src/uml/qinformationitem.h index bea98164..d5b5bc8d 100644 --- a/src/uml/qinformationitem.h +++ b/src/uml/qinformationitem.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QInformationItem : public QClassifier { Q_OBJECT - Q_PROPERTY(QSet<QClassifier *> represented READ represented) + Q_PROPERTY(QSet<QtUml::QClassifier *> represented READ represented) Q_DISABLE_COPY(QInformationItem) Q_DECLARE_PRIVATE(QInformationItem) @@ -81,7 +84,9 @@ protected: explicit QInformationItem(QInformationItemPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinformationitem_p.h b/src/uml/qinformationitem_p.h index f94db967..6ebe1fb0 100644 --- a/src/uml/qinformationitem_p.h +++ b/src/uml/qinformationitem_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QInformationItem; @@ -67,7 +70,9 @@ public: QSet<QClassifier *> represented; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinitialnode.cpp b/src/uml/qinitialnode.cpp index 80f71b38..212850cb 100644 --- a/src/uml/qinitialnode.cpp +++ b/src/uml/qinitialnode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInitialNodePrivate::QInitialNodePrivate() { @@ -83,7 +86,9 @@ void QInitialNode::setPropertyData() QControlNode::setPropertyData(); } -#include "moc_qinitialnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinitialnode.cpp" diff --git a/src/uml/qinitialnode.h b/src/uml/qinitialnode.h index 074947f9..ec118bc9 100644 --- a/src/uml/qinitialnode.h +++ b/src/uml/qinitialnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QInitialNode(QInitialNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinitialnode_p.h b/src/uml/qinitialnode_p.h index 0ddd23d8..6ca6cd74 100644 --- a/src/uml/qinitialnode_p.h +++ b/src/uml/qinitialnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QInitialNode; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinputpin.cpp b/src/uml/qinputpin.cpp index 99361bda..52f6433d 100644 --- a/src/uml/qinputpin.cpp +++ b/src/uml/qinputpin.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInputPinPrivate::QInputPinPrivate() { @@ -83,7 +86,9 @@ void QInputPin::setPropertyData() QPin::setPropertyData(); } -#include "moc_qinputpin.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinputpin.cpp" diff --git a/src/uml/qinputpin.h b/src/uml/qinputpin.h index d2503301..175743bd 100644 --- a/src/uml/qinputpin.h +++ b/src/uml/qinputpin.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QInputPin(QInputPinPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinputpin_p.h b/src/uml/qinputpin_p.h index 1bc0960f..cddae968 100644 --- a/src/uml/qinputpin_p.h +++ b/src/uml/qinputpin_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QInputPin; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinstancespecification.cpp b/src/uml/qinstancespecification.cpp index 01464327..036f1e9f 100644 --- a/src/uml/qinstancespecification.cpp +++ b/src/uml/qinstancespecification.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInstanceSpecificationPrivate::QInstanceSpecificationPrivate() : specification(0) @@ -232,19 +235,19 @@ void QInstanceSpecification::setTemplateParameter(QTemplateParameter *templatePa /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QInstanceSpecification::visibility() const +QtUmlNS::VisibilityKind QInstanceSpecification::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QInstanceSpecification::setVisibility(QtUml::VisibilityKind visibility) +void QInstanceSpecification::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QInstanceSpecification::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QInstanceSpecification); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -388,31 +391,33 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_) void QInstanceSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A specification of how to compute, derive, or construct the instance."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QSlot::owningInstance"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier or classifiers of the represented instance. If multiple classifiers are specified, the instance is classified by all of them."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A specification of how to compute, derive, or construct the instance."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A slot giving the value or values of a structural feature of the instance. An instance specification can have one slot per structural feature of its classifiers, including inherited features. It is not necessary to model a slot for each structural feature, in which case the instance specification is a partial description."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceSpecification")][QString::fromLatin1("slots_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QSlot::owningInstance"); QWrappedObject::setPropertyData(); } -#include "moc_qinstancespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinstancespecification.cpp" diff --git a/src/uml/qinstancespecification.h b/src/uml/qinstancespecification.h index 09391a85..c383d501 100644 --- a/src/uml/qinstancespecification.h +++ b/src/uml/qinstancespecification.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,27 +72,27 @@ class Q_UML_EXPORT QInstanceSpecification : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QSet<QPackageableElement *> deployedElements READ deployedElements STORED false) - Q_PROPERTY(QSet<QDeployment *> deployments READ deployments) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> deployedElements READ deployedElements STORED false) + Q_PROPERTY(QSet<QtUml::QDeployment *> deployments READ deployments) - Q_PROPERTY(QSet<QClassifier *> classifiers READ classifiers) - Q_PROPERTY(QValueSpecification * specification READ specification WRITE setSpecification) - Q_PROPERTY(QSet<QSlot *> slots_ READ slots_) + Q_PROPERTY(QSet<QtUml::QClassifier *> classifiers READ classifiers) + Q_PROPERTY(QtUml::QValueSpecification * specification READ specification WRITE setSpecification) + Q_PROPERTY(QSet<QtUml::QSlot *> slots_ READ slots_) Q_DISABLE_COPY(QInstanceSpecification) Q_DECLARE_PRIVATE(QInstanceSpecification) @@ -125,8 +128,8 @@ public: Q_INVOKABLE void setTemplateParameter(QTemplateParameter *templateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QDeploymentTarget @@ -156,7 +159,9 @@ private: QDeploymentTarget *_wrappedDeploymentTarget; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinstancespecification_p.h b/src/uml/qinstancespecification_p.h index 62ccae6a..447c3946 100644 --- a/src/uml/qinstancespecification_p.h +++ b/src/uml/qinstancespecification_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ public: QSet<QSlot *> slots_; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinstancevalue.cpp b/src/uml/qinstancevalue.cpp index f4b3fce9..649d8e5a 100644 --- a/src/uml/qinstancevalue.cpp +++ b/src/uml/qinstancevalue.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInstanceValuePrivate::QInstanceValuePrivate() : instance(0) @@ -108,17 +111,19 @@ void QInstanceValue::setInstance(QInstanceSpecification *instance) void QInstanceValue::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance that is the specified value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance that is the specified value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qinstancevalue.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinstancevalue.cpp" diff --git a/src/uml/qinstancevalue.h b/src/uml/qinstancevalue.h index 61ddcbfd..e1791916 100644 --- a/src/uml/qinstancevalue.h +++ b/src/uml/qinstancevalue.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QInstanceValue : public QValueSpecification { Q_OBJECT - Q_PROPERTY(QInstanceSpecification * instance READ instance WRITE setInstance) + Q_PROPERTY(QtUml::QInstanceSpecification * instance READ instance WRITE setInstance) Q_DISABLE_COPY(QInstanceValue) Q_DECLARE_PRIVATE(QInstanceValue) @@ -80,7 +83,9 @@ protected: explicit QInstanceValue(QInstanceValuePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinstancevalue_p.h b/src/uml/qinstancevalue_p.h index 59bab39f..0f1c35c4 100644 --- a/src/uml/qinstancevalue_p.h +++ b/src/uml/qinstancevalue_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QInstanceSpecification *instance; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteraction.cpp b/src/uml/qinteraction.cpp index 3b9d527b..14312d07 100644 --- a/src/uml/qinteraction.cpp +++ b/src/uml/qinteraction.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInteractionPrivate::QInteractionPrivate() { @@ -284,12 +287,12 @@ void QInteraction::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QInteraction::visibility() const +QtUmlNS::VisibilityKind QInteraction::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QInteraction::setVisibility(QtUml::VisibilityKind visibility) +void QInteraction::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -620,45 +623,47 @@ void QInteraction::removeLifeline(QLifeline *lifeline) void QInteraction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Actions owned by the Interaction."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Messages contained in this Interaction."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QMessage::interaction"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the gates that form the message interface between this Interaction and any InteractionUses which reference it."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of fragments in the Interaction."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionFragment::enclosingInteraction"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the participants in this Interaction."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QLifeline::interaction"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Actions owned by the Interaction."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Messages contained in this Interaction."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("messages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QMessage::interaction"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the gates that form the message interface between this Interaction and any InteractionUses which reference it."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("formalGates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of fragments in the Interaction."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("fragments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionFragment::enclosingInteraction"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the participants in this Interaction."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteraction")][QString::fromLatin1("lifelines")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QLifeline::interaction"); QWrappedObject::setPropertyData(); } -#include "moc_qinteraction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinteraction.cpp" diff --git a/src/uml/qinteraction.h b/src/uml/qinteraction.h index 459d9272..6e570822 100644 --- a/src/uml/qinteraction.h +++ b/src/uml/qinteraction.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,35 +74,35 @@ class Q_UML_EXPORT QInteraction : public QWrappedObject Q_OBJECT Q_PROPERTY(bool isReentrant READ isReentrant WRITE setReentrant RESET unsetReentrant) - Q_PROPERTY(QBehavioralFeature * specification READ specification WRITE setSpecification) - Q_PROPERTY(QSet<QConstraint *> postconditions READ postconditions) - Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) - Q_PROPERTY(QSet<QBehavior *> redefinedBehaviors READ redefinedBehaviors) - Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) - Q_PROPERTY(QSet<QParameterSet *> ownedParameterSets READ ownedParameterSets) - Q_PROPERTY(QBehavioredClassifier * context READ context STORED false) - - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QtUml::QBehavioralFeature * specification READ specification WRITE setSpecification) + Q_PROPERTY(QSet<QtUml::QConstraint *> postconditions READ postconditions) + Q_PROPERTY(QSet<QtUml::QConstraint *> preconditions READ preconditions) + Q_PROPERTY(QSet<QtUml::QBehavior *> redefinedBehaviors READ redefinedBehaviors) + Q_PROPERTY(QList<QtUml::QParameter *> ownedParameters READ ownedParameters) + Q_PROPERTY(QSet<QtUml::QParameterSet *> ownedParameterSets READ ownedParameterSets) + Q_PROPERTY(QtUml::QBehavioredClassifier * context READ context STORED false) + + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QGeneralOrdering *> generalOrderings READ generalOrderings) - Q_PROPERTY(QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction) - Q_PROPERTY(QSet<QLifeline *> covered READ covered) - Q_PROPERTY(QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand) + Q_PROPERTY(QSet<QtUml::QGeneralOrdering *> generalOrderings READ generalOrderings) + Q_PROPERTY(QtUml::QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction) + Q_PROPERTY(QSet<QtUml::QLifeline *> covered READ covered) + Q_PROPERTY(QtUml::QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand) - Q_PROPERTY(QSet<QAction *> actions READ actions) - Q_PROPERTY(QSet<QMessage *> messages READ messages) - Q_PROPERTY(QSet<QGate *> formalGates READ formalGates) - Q_PROPERTY(QList<QInteractionFragment *> fragments READ fragments) - Q_PROPERTY(QSet<QLifeline *> lifelines READ lifelines) + Q_PROPERTY(QSet<QtUml::QAction *> actions READ actions) + Q_PROPERTY(QSet<QtUml::QMessage *> messages READ messages) + Q_PROPERTY(QSet<QtUml::QGate *> formalGates READ formalGates) + Q_PROPERTY(QList<QtUml::QInteractionFragment *> fragments READ fragments) + Q_PROPERTY(QSet<QtUml::QLifeline *> lifelines READ lifelines) Q_DISABLE_COPY(QInteraction) Q_DECLARE_PRIVATE(QInteraction) @@ -143,8 +146,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -194,7 +197,9 @@ private: QInteractionFragment *_wrappedInteractionFragment; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteraction_p.h b/src/uml/qinteraction_p.h index 639f7534..c97123bb 100644 --- a/src/uml/qinteraction_p.h +++ b/src/uml/qinteraction_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -80,7 +83,9 @@ public: QSet<QLifeline *> lifelines; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionconstraint.cpp b/src/uml/qinteractionconstraint.cpp index a96998b8..3188b7b7 100644 --- a/src/uml/qinteractionconstraint.cpp +++ b/src/uml/qinteractionconstraint.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInteractionConstraintPrivate::QInteractionConstraintPrivate() : maxint(0), @@ -146,24 +149,26 @@ void QInteractionConstraint::setMinint(QValueSpecification *minint) void QInteractionConstraint::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The maximum number of iterations of a loop"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The minimum number of iterations of a loop"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The maximum number of iterations of a loop"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The minimum number of iterations of a loop"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionConstraint")][QString::fromLatin1("minint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QConstraint::setPropertyData(); } -#include "moc_qinteractionconstraint.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinteractionconstraint.cpp" diff --git a/src/uml/qinteractionconstraint.h b/src/uml/qinteractionconstraint.h index ed45de50..285adc7e 100644 --- a/src/uml/qinteractionconstraint.h +++ b/src/uml/qinteractionconstraint.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QInteractionConstraint : public QConstraint { Q_OBJECT - Q_PROPERTY(QValueSpecification * maxint READ maxint WRITE setMaxint) - Q_PROPERTY(QValueSpecification * minint READ minint WRITE setMinint) + Q_PROPERTY(QtUml::QValueSpecification * maxint READ maxint WRITE setMaxint) + Q_PROPERTY(QtUml::QValueSpecification * minint READ minint WRITE setMinint) Q_DISABLE_COPY(QInteractionConstraint) Q_DECLARE_PRIVATE(QInteractionConstraint) @@ -83,7 +86,9 @@ protected: explicit QInteractionConstraint(QInteractionConstraintPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionconstraint_p.h b/src/uml/qinteractionconstraint_p.h index b42bd5b2..766a5690 100644 --- a/src/uml/qinteractionconstraint_p.h +++ b/src/uml/qinteractionconstraint_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QValueSpecification *minint; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionfragment.cpp b/src/uml/qinteractionfragment.cpp index ef5a2386..af9f4fd2 100644 --- a/src/uml/qinteractionfragment.cpp +++ b/src/uml/qinteractionfragment.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInteractionFragmentPrivate::QInteractionFragmentPrivate() : enclosingInteraction(0), @@ -230,38 +233,40 @@ void QInteractionFragment::setEnclosingOperand(QInteractionOperand *enclosingOpe void QInteractionFragment::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The general ordering relationships contained in this fragment."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Interaction enclosing this InteractionFragment."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteraction::fragment"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Lifelines that the InteractionFragment involves."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QLifeline::coveredBy"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operand enclosing this InteractionFragment (they may nest recursively)"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionOperand::fragment"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The general ordering relationships contained in this fragment."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Interaction enclosing this InteractionFragment."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingInteraction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteraction::fragment"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Lifelines that the InteractionFragment involves."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("covered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QLifeline::coveredBy"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operand enclosing this InteractionFragment (they may nest recursively)"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionFragment")][QString::fromLatin1("enclosingOperand")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionOperand::fragment"); QNamedElement::setPropertyData(); } -#include "moc_qinteractionfragment.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinteractionfragment.cpp" diff --git a/src/uml/qinteractionfragment.h b/src/uml/qinteractionfragment.h index 5cedd29f..ceb333c5 100644 --- a/src/uml/qinteractionfragment.h +++ b/src/uml/qinteractionfragment.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,10 +70,10 @@ class Q_UML_EXPORT QInteractionFragment : public QNamedElement { Q_OBJECT - Q_PROPERTY(QSet<QGeneralOrdering *> generalOrderings READ generalOrderings) - Q_PROPERTY(QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction) - Q_PROPERTY(QSet<QLifeline *> covered READ covered) - Q_PROPERTY(QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand) + Q_PROPERTY(QSet<QtUml::QGeneralOrdering *> generalOrderings READ generalOrderings) + Q_PROPERTY(QtUml::QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction) + Q_PROPERTY(QSet<QtUml::QLifeline *> covered READ covered) + Q_PROPERTY(QtUml::QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand) Q_DISABLE_COPY(QInteractionFragment) Q_DECLARE_PRIVATE(QInteractionFragment) @@ -97,7 +100,9 @@ protected: explicit QInteractionFragment(QInteractionFragmentPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionfragment_p.h b/src/uml/qinteractionfragment_p.h index c9c2f29e..a57346ae 100644 --- a/src/uml/qinteractionfragment_p.h +++ b/src/uml/qinteractionfragment_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,7 +78,9 @@ public: QInteractionOperand *enclosingOperand; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionoperand.cpp b/src/uml/qinteractionoperand.cpp index a7406223..24b92f4b 100644 --- a/src/uml/qinteractionoperand.cpp +++ b/src/uml/qinteractionoperand.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInteractionOperandPrivate::QInteractionOperandPrivate() : guard(0) @@ -143,12 +146,12 @@ void QInteractionOperand::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QInteractionOperand::visibility() const +QtUmlNS::VisibilityKind QInteractionOperand::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QInteractionOperand::setVisibility(QtUml::VisibilityKind visibility) +void QInteractionOperand::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -430,24 +433,26 @@ void QInteractionOperand::setGuard(QInteractionConstraint *guard) void QInteractionOperand::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The fragments of the operand."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionFragment::enclosingOperand"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The fragments of the operand."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionFragment::enclosingOperand"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint of the operand."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint of the operand."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionOperand")][QString::fromLatin1("guard")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qinteractionoperand.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinteractionoperand.cpp" diff --git a/src/uml/qinteractionoperand.h b/src/uml/qinteractionoperand.h index 628c4510..095aaac4 100644 --- a/src/uml/qinteractionoperand.h +++ b/src/uml/qinteractionoperand.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,31 +69,31 @@ class Q_UML_EXPORT QInteractionOperand : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QGeneralOrdering *> generalOrderings READ generalOrderings) - Q_PROPERTY(QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction) - Q_PROPERTY(QSet<QLifeline *> covered READ covered) - Q_PROPERTY(QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand) + Q_PROPERTY(QSet<QtUml::QGeneralOrdering *> generalOrderings READ generalOrderings) + Q_PROPERTY(QtUml::QInteraction * enclosingInteraction READ enclosingInteraction WRITE setEnclosingInteraction) + Q_PROPERTY(QSet<QtUml::QLifeline *> covered READ covered) + Q_PROPERTY(QtUml::QInteractionOperand * enclosingOperand READ enclosingOperand WRITE setEnclosingOperand) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QList<QInteractionFragment *> fragments READ fragments) - Q_PROPERTY(QInteractionConstraint * guard READ guard WRITE setGuard) + Q_PROPERTY(QList<QtUml::QInteractionFragment *> fragments READ fragments) + Q_PROPERTY(QtUml::QInteractionConstraint * guard READ guard WRITE setGuard) Q_DISABLE_COPY(QInteractionOperand) Q_DECLARE_PRIVATE(QInteractionOperand) @@ -109,8 +112,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -164,7 +167,9 @@ private: QNamespace *_wrappedNamespace; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionoperand_p.h b/src/uml/qinteractionoperand_p.h index 85f3d460..1bba78c8 100644 --- a/src/uml/qinteractionoperand_p.h +++ b/src/uml/qinteractionoperand_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QInteractionConstraint *guard; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionuse.cpp b/src/uml/qinteractionuse.cpp index 499ff515..9aae532e 100644 --- a/src/uml/qinteractionuse.cpp +++ b/src/uml/qinteractionuse.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInteractionUsePrivate::QInteractionUsePrivate() : returnValue(0), @@ -237,45 +240,47 @@ void QInteractionUse::setReturnValueRecipient(QProperty *returnValueRecipient) void QInteractionUse::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The actual gates of the InteractionUse"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of the executed Interaction."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the Interaction that defines its meaning"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The actual arguments of the Interaction"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The recipient of the return value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The actual gates of the InteractionUse"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of the executed Interaction."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the Interaction that defines its meaning"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("refersTo")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The actual arguments of the Interaction"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("arguments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The recipient of the return value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInteractionUse")][QString::fromLatin1("returnValueRecipient")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInteractionFragment::setPropertyData(); } -#include "moc_qinteractionuse.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinteractionuse.cpp" diff --git a/src/uml/qinteractionuse.h b/src/uml/qinteractionuse.h index 39c9c1ce..e60352c7 100644 --- a/src/uml/qinteractionuse.h +++ b/src/uml/qinteractionuse.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,11 +71,11 @@ class Q_UML_EXPORT QInteractionUse : public QInteractionFragment { Q_OBJECT - Q_PROPERTY(QSet<QGate *> actualGates READ actualGates) - Q_PROPERTY(QValueSpecification * returnValue READ returnValue WRITE setReturnValue) - Q_PROPERTY(QInteraction * refersTo READ refersTo WRITE setRefersTo) - Q_PROPERTY(QList<QValueSpecification *> arguments READ arguments) - Q_PROPERTY(QProperty * returnValueRecipient READ returnValueRecipient WRITE setReturnValueRecipient) + Q_PROPERTY(QSet<QtUml::QGate *> actualGates READ actualGates) + Q_PROPERTY(QtUml::QValueSpecification * returnValue READ returnValue WRITE setReturnValue) + Q_PROPERTY(QtUml::QInteraction * refersTo READ refersTo WRITE setRefersTo) + Q_PROPERTY(QList<QtUml::QValueSpecification *> arguments READ arguments) + Q_PROPERTY(QtUml::QProperty * returnValueRecipient READ returnValueRecipient WRITE setReturnValueRecipient) Q_DISABLE_COPY(QInteractionUse) Q_DECLARE_PRIVATE(QInteractionUse) @@ -101,7 +104,9 @@ protected: explicit QInteractionUse(QInteractionUsePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinteractionuse_p.h b/src/uml/qinteractionuse_p.h index 4050ea23..9d9deb9b 100644 --- a/src/uml/qinteractionuse_p.h +++ b/src/uml/qinteractionuse_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -78,7 +81,9 @@ public: QProperty *returnValueRecipient; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterface.cpp b/src/uml/qinterface.cpp index eea833f7..c8aa49af 100644 --- a/src/uml/qinterface.cpp +++ b/src/uml/qinterface.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInterfacePrivate::QInterfacePrivate() : protocol(0) @@ -322,47 +325,47 @@ void QInterface::removeOwnedAttribute(QProperty *ownedAttribute) void QInterface::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a protocol state machine specifying the legal sequences of the invocation of the behavioral features described in the interface."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Interfaces redefined by this Interface."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::redefinedClassifiers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Receptions that objects providing this interface are willing to accept."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operations owned by the class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::interface"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Classifiers that are defined (nested) within the Class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes (i.e. the properties) owned by the class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::interface"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a protocol state machine specifying the legal sequences of the invocation of the behavioral features described in the interface."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Interfaces redefined by this Interface."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::redefinedClassifiers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("redefinedInterfaces")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Receptions that objects providing this interface are willing to accept."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedReceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operations owned by the class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::interface"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References all the Classifiers that are defined (nested) within the Class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("nestedClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes (i.e. the properties) owned by the class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterface")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::interface"); QClassifier::setPropertyData(); } @@ -379,7 +382,9 @@ void QInterface::removeRedefinedClassifier(QWrappedObjectPointer<QInterface> red removeRedefinedInterface(redefinedInterface); } -#include "moc_qinterface.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinterface.cpp" diff --git a/src/uml/qinterface.h b/src/uml/qinterface.h index 574b1e3d..d1306d50 100644 --- a/src/uml/qinterface.h +++ b/src/uml/qinterface.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,12 +73,12 @@ class Q_UML_EXPORT QInterface : public QClassifier { Q_OBJECT - Q_PROPERTY(QProtocolStateMachine * protocol READ protocol WRITE setProtocol) - Q_PROPERTY(QSet<QInterface *> redefinedInterfaces READ redefinedInterfaces) - Q_PROPERTY(QSet<QReception *> ownedReceptions READ ownedReceptions) - Q_PROPERTY(QList<QOperation *> ownedOperations READ ownedOperations) - Q_PROPERTY(QList<QClassifier *> nestedClassifiers READ nestedClassifiers) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QtUml::QProtocolStateMachine * protocol READ protocol WRITE setProtocol) + Q_PROPERTY(QSet<QtUml::QInterface *> redefinedInterfaces READ redefinedInterfaces) + Q_PROPERTY(QSet<QtUml::QReception *> ownedReceptions READ ownedReceptions) + Q_PROPERTY(QList<QtUml::QOperation *> ownedOperations READ ownedOperations) + Q_PROPERTY(QList<QtUml::QClassifier *> nestedClassifiers READ nestedClassifiers) + Q_PROPERTY(QList<QtUml::QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QInterface) Q_DECLARE_PRIVATE(QInterface) @@ -113,7 +116,9 @@ protected: explicit QInterface(QInterfacePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterface_p.h b/src/uml/qinterface_p.h index c0c80a4b..b73ba961 100644 --- a/src/uml/qinterface_p.h +++ b/src/uml/qinterface_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -79,7 +82,9 @@ public: QList<QProperty *> ownedAttributes; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterfacerealization.cpp b/src/uml/qinterfacerealization.cpp index 265fb949..62a1552f 100644 --- a/src/uml/qinterfacerealization.cpp +++ b/src/uml/qinterfacerealization.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInterfaceRealizationPrivate::QInterfaceRealizationPrivate() : implementingClassifier(0), @@ -156,19 +159,19 @@ void QInterfaceRealization::setContract(QInterface *contract) void QInterfaceRealization::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the BehavioredClassifier that owns this Interfacerealization (i.e., the classifier that realizes the Interface to which it points)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDependency::clients"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QBehavioredClassifier::interfaceRealization"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interface specifying the conformance contract."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the BehavioredClassifier that owns this Interfacerealization (i.e., the classifier that realizes the Interface to which it points)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDependency::clients"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QBehavioredClassifier::interfaceRealization"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interface specifying the conformance contract."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterfaceRealization")][QString::fromLatin1("contract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QRealization::setPropertyData(); } @@ -197,7 +200,9 @@ void QInterfaceRealization::removeSupplier(QWrappedObjectPointer<QInterface> con setContract(0); } -#include "moc_qinterfacerealization.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinterfacerealization.cpp" diff --git a/src/uml/qinterfacerealization.h b/src/uml/qinterfacerealization.h index deb3218f..9786995d 100644 --- a/src/uml/qinterfacerealization.h +++ b/src/uml/qinterfacerealization.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,8 +67,8 @@ class Q_UML_EXPORT QInterfaceRealization : public QRealization { Q_OBJECT - Q_PROPERTY(QBehavioredClassifier * implementingClassifier READ implementingClassifier WRITE setImplementingClassifier) - Q_PROPERTY(QInterface * contract READ contract WRITE setContract) + Q_PROPERTY(QtUml::QBehavioredClassifier * implementingClassifier READ implementingClassifier WRITE setImplementingClassifier) + Q_PROPERTY(QtUml::QInterface * contract READ contract WRITE setContract) Q_DISABLE_COPY(QInterfaceRealization) Q_DECLARE_PRIVATE(QInterfaceRealization) @@ -92,7 +95,9 @@ protected: explicit QInterfaceRealization(QInterfaceRealizationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterfacerealization_p.h b/src/uml/qinterfacerealization_p.h index 9ba06c29..433826d8 100644 --- a/src/uml/qinterfacerealization_p.h +++ b/src/uml/qinterfacerealization_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QInterface *contract; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterruptibleactivityregion.cpp b/src/uml/qinterruptibleactivityregion.cpp index a40977e0..61946669 100644 --- a/src/uml/qinterruptibleactivityregion.cpp +++ b/src/uml/qinterruptibleactivityregion.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInterruptibleActivityRegionPrivate::QInterruptibleActivityRegionPrivate() { @@ -168,24 +171,26 @@ void QInterruptibleActivityRegion::removeNode(QActivityNode *node) void QInterruptibleActivityRegion::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The edges leaving the region that will abort other tokens flowing in the region."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::interrupts"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedNodes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inInterruptibleRegion"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The edges leaving the region that will abort other tokens flowing in the region."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::interrupts"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedNodes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterruptibleActivityRegion")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inInterruptibleRegion"); QActivityGroup::setPropertyData(); } -#include "moc_qinterruptibleactivityregion.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinterruptibleactivityregion.cpp" diff --git a/src/uml/qinterruptibleactivityregion.h b/src/uml/qinterruptibleactivityregion.h index be34cdad..549b4d8a 100644 --- a/src/uml/qinterruptibleactivityregion.h +++ b/src/uml/qinterruptibleactivityregion.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QInterruptibleActivityRegion : public QActivityGroup { Q_OBJECT - Q_PROPERTY(QSet<QActivityEdge *> interruptingEdges READ interruptingEdges) - Q_PROPERTY(QSet<QActivityNode *> nodes READ nodes) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> interruptingEdges READ interruptingEdges) + Q_PROPERTY(QSet<QtUml::QActivityNode *> nodes READ nodes) Q_DISABLE_COPY(QInterruptibleActivityRegion) Q_DECLARE_PRIVATE(QInterruptibleActivityRegion) @@ -89,7 +92,9 @@ protected: explicit QInterruptibleActivityRegion(QInterruptibleActivityRegionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterruptibleactivityregion_p.h b/src/uml/qinterruptibleactivityregion_p.h index cd494a57..633dee2d 100644 --- a/src/uml/qinterruptibleactivityregion_p.h +++ b/src/uml/qinterruptibleactivityregion_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QActivityNode *> nodes; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterval.cpp b/src/uml/qinterval.cpp index 131bf3f7..6b3cf703 100644 --- a/src/uml/qinterval.cpp +++ b/src/uml/qinterval.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QIntervalPrivate::QIntervalPrivate() : min(0), @@ -128,24 +131,26 @@ void QInterval::setMax(QValueSpecification *max) void QInterval::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("min")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("min")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("min")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the ValueSpecification denoting the minimum value of the range."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("min")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("min")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("min")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("max")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("max")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("max")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the ValueSpecification denoting the maximum value of the range."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("max")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("max")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("max")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("min")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("min")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("min")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the ValueSpecification denoting the minimum value of the range."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("min")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("min")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("min")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("max")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("max")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("max")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the ValueSpecification denoting the maximum value of the range."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("max")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("max")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInterval")][QString::fromLatin1("max")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qinterval.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinterval.cpp" diff --git a/src/uml/qinterval.h b/src/uml/qinterval.h index ec684121..2bbf6d41 100644 --- a/src/uml/qinterval.h +++ b/src/uml/qinterval.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -58,8 +61,8 @@ class Q_UML_EXPORT QInterval : public QValueSpecification { Q_OBJECT - Q_PROPERTY(QValueSpecification * min READ min WRITE setMin) - Q_PROPERTY(QValueSpecification * max READ max WRITE setMax) + Q_PROPERTY(QtUml::QValueSpecification * min READ min WRITE setMin) + Q_PROPERTY(QtUml::QValueSpecification * max READ max WRITE setMax) Q_DISABLE_COPY(QInterval) Q_DECLARE_PRIVATE(QInterval) @@ -80,7 +83,9 @@ protected: explicit QInterval(QIntervalPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinterval_p.h b/src/uml/qinterval_p.h index 0cd5029e..e7267934 100644 --- a/src/uml/qinterval_p.h +++ b/src/uml/qinterval_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QInterval; @@ -65,7 +68,9 @@ public: QValueSpecification *max; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qintervalconstraint.cpp b/src/uml/qintervalconstraint.cpp index a20ff75f..d320548f 100644 --- a/src/uml/qintervalconstraint.cpp +++ b/src/uml/qintervalconstraint.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QIntervalConstraintPrivate::QIntervalConstraintPrivate() : specification(0) @@ -114,17 +117,19 @@ void QIntervalConstraint::setSpecification(QInterval *specification) void QIntervalConstraint::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QConstraint::specification"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QConstraint::specification"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QConstraint::setPropertyData(); } -#include "moc_qintervalconstraint.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qintervalconstraint.cpp" diff --git a/src/uml/qintervalconstraint.h b/src/uml/qintervalconstraint.h index ebd6a002..3d906ed5 100644 --- a/src/uml/qintervalconstraint.h +++ b/src/uml/qintervalconstraint.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QIntervalConstraint : public QConstraint { Q_OBJECT - Q_PROPERTY(QInterval * specification READ specification WRITE setSpecification) + Q_PROPERTY(QtUml::QInterval * specification READ specification WRITE setSpecification) Q_DISABLE_COPY(QIntervalConstraint) Q_DECLARE_PRIVATE(QIntervalConstraint) @@ -80,7 +83,9 @@ protected: explicit QIntervalConstraint(QIntervalConstraintPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qintervalconstraint_p.h b/src/uml/qintervalconstraint_p.h index 188859e9..602890e3 100644 --- a/src/uml/qintervalconstraint_p.h +++ b/src/uml/qintervalconstraint_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QInterval *specification; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinvocationaction.cpp b/src/uml/qinvocationaction.cpp index 91d2ebb5..26136766 100644 --- a/src/uml/qinvocationaction.cpp +++ b/src/uml/qinvocationaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QInvocationActionPrivate::QInvocationActionPrivate() : onPort(0) @@ -146,24 +149,26 @@ void QInvocationAction::setOnPort(QPort *onPort) void QInvocationAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specification of the ordered set of argument values that appears during execution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A optional port of the receiver object on which the behavioral feature is invoked."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specification of the ordered set of argument values that appears during execution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A optional port of the receiver object on which the behavioral feature is invoked."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QInvocationAction")][QString::fromLatin1("onPort")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qinvocationaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qinvocationaction.cpp" diff --git a/src/uml/qinvocationaction.h b/src/uml/qinvocationaction.h index b3f2c53e..3841743e 100644 --- a/src/uml/qinvocationaction.h +++ b/src/uml/qinvocationaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QInvocationAction : public QAction { Q_OBJECT - Q_PROPERTY(QList<QInputPin *> arguments READ arguments) - Q_PROPERTY(QPort * onPort READ onPort WRITE setOnPort) + Q_PROPERTY(QList<QtUml::QInputPin *> arguments READ arguments) + Q_PROPERTY(QtUml::QPort * onPort READ onPort WRITE setOnPort) Q_DISABLE_COPY(QInvocationAction) Q_DECLARE_PRIVATE(QInvocationAction) @@ -88,7 +91,9 @@ protected: explicit QInvocationAction(QInvocationActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qinvocationaction_p.h b/src/uml/qinvocationaction_p.h index 483c90f7..bf53f9cb 100644 --- a/src/uml/qinvocationaction_p.h +++ b/src/uml/qinvocationaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QPort *onPort; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qjoinnode.cpp b/src/uml/qjoinnode.cpp index 1575da33..be8d2491 100644 --- a/src/uml/qjoinnode.cpp +++ b/src/uml/qjoinnode.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QJoinNodePrivate::QJoinNodePrivate() : isCombineDuplicate(true), @@ -150,24 +153,26 @@ void QJoinNode::setJoinSpec(QValueSpecification *joinSpec) void QJoinNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether tokens having objects with the same identity are combined into one by the join."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A specification giving the conditions under which the join with emit a token. Default is \"and\"."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether tokens having objects with the same identity are combined into one by the join."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A specification giving the conditions under which the join with emit a token. Default is \"and\"."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QJoinNode")][QString::fromLatin1("joinSpec")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QControlNode::setPropertyData(); } -#include "moc_qjoinnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qjoinnode.cpp" diff --git a/src/uml/qjoinnode.h b/src/uml/qjoinnode.h index f016f150..ba13f7b8 100644 --- a/src/uml/qjoinnode.h +++ b/src/uml/qjoinnode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QJoinNode : public QControlNode Q_OBJECT Q_PROPERTY(bool isCombineDuplicate READ isCombineDuplicate WRITE setCombineDuplicate RESET unsetCombineDuplicate) - Q_PROPERTY(QValueSpecification * joinSpec READ joinSpec WRITE setJoinSpec) + Q_PROPERTY(QtUml::QValueSpecification * joinSpec READ joinSpec WRITE setJoinSpec) Q_DISABLE_COPY(QJoinNode) Q_DECLARE_PRIVATE(QJoinNode) @@ -86,7 +89,9 @@ protected: explicit QJoinNode(QJoinNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qjoinnode_p.h b/src/uml/qjoinnode_p.h index 6ccfdd92..b3f43af5 100644 --- a/src/uml/qjoinnode_p.h +++ b/src/uml/qjoinnode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QValueSpecification *joinSpec; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlifeline.cpp b/src/uml/qlifeline.cpp index c6768e8f..62122bb0 100644 --- a/src/uml/qlifeline.cpp +++ b/src/uml/qlifeline.cpp @@ -50,7 +50,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLifelinePrivate::QLifelinePrivate() : represents(0), @@ -235,45 +238,47 @@ void QLifeline::setSelector(QValueSpecification *selector) void QLifeline::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ConnectableElement within the classifier that contains the enclosing interaction."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interaction that represents the decomposition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the InteractionFragments in which this Lifeline takes part."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionFragment::covered"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interaction enclosing this Lifeline."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteraction::lifeline"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If the referenced ConnectableElement is multivalued, then this specifies the specific individual part within that set."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ConnectableElement within the classifier that contains the enclosing interaction."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interaction that represents the decomposition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("decomposedAs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the InteractionFragments in which this Lifeline takes part."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("coveredBy")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteractionFragment::covered"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interaction enclosing this Lifeline."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("interaction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteraction::lifeline"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If the referenced ConnectableElement is multivalued, then this specifies the specific individual part within that set."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLifeline")][QString::fromLatin1("selector")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qlifeline.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qlifeline.cpp" diff --git a/src/uml/qlifeline.h b/src/uml/qlifeline.h index 43fc8807..73c312ca 100644 --- a/src/uml/qlifeline.h +++ b/src/uml/qlifeline.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,11 +71,11 @@ class Q_UML_EXPORT QLifeline : public QNamedElement { Q_OBJECT - Q_PROPERTY(QConnectableElement * represents READ represents WRITE setRepresents) - Q_PROPERTY(QPartDecomposition * decomposedAs READ decomposedAs WRITE setDecomposedAs) - Q_PROPERTY(QSet<QInteractionFragment *> coveredBy READ coveredBy) - Q_PROPERTY(QInteraction * interaction READ interaction WRITE setInteraction) - Q_PROPERTY(QValueSpecification * selector READ selector WRITE setSelector) + Q_PROPERTY(QtUml::QConnectableElement * represents READ represents WRITE setRepresents) + Q_PROPERTY(QtUml::QPartDecomposition * decomposedAs READ decomposedAs WRITE setDecomposedAs) + Q_PROPERTY(QSet<QtUml::QInteractionFragment *> coveredBy READ coveredBy) + Q_PROPERTY(QtUml::QInteraction * interaction READ interaction WRITE setInteraction) + Q_PROPERTY(QtUml::QValueSpecification * selector READ selector WRITE setSelector) Q_DISABLE_COPY(QLifeline) Q_DECLARE_PRIVATE(QLifeline) @@ -100,7 +103,9 @@ protected: explicit QLifeline(QLifelinePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlifeline_p.h b/src/uml/qlifeline_p.h index a6d2663b..3afe1040 100644 --- a/src/uml/qlifeline_p.h +++ b/src/uml/qlifeline_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -78,7 +81,9 @@ public: QValueSpecification *selector; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkaction.cpp b/src/uml/qlinkaction.cpp index e55d333b..7b842318 100644 --- a/src/uml/qlinkaction.cpp +++ b/src/uml/qlinkaction.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLinkActionPrivate::QLinkActionPrivate() { @@ -172,24 +175,26 @@ QAssociation *QLinkAction::association() const void QLinkAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pins taking end objects and qualifier values as input."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Data identifying one end of a link by the objects on its ends and qualifiers."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pins taking end objects and qualifier values as input."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Data identifying one end of a link by the objects on its ends and qualifiers."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qlinkaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qlinkaction.cpp" diff --git a/src/uml/qlinkaction.h b/src/uml/qlinkaction.h index c2296cab..c81240a5 100644 --- a/src/uml/qlinkaction.h +++ b/src/uml/qlinkaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,8 +69,8 @@ class Q_UML_EXPORT QLinkAction : public QAction { Q_OBJECT - Q_PROPERTY(QSet<QInputPin *> inputValues READ inputValues) - Q_PROPERTY(QSet<QLinkEndData *> endData READ endData) + Q_PROPERTY(QSet<QtUml::QInputPin *> inputValues READ inputValues) + Q_PROPERTY(QSet<QtUml::QLinkEndData *> endData READ endData) Q_DISABLE_COPY(QLinkAction) Q_DECLARE_PRIVATE(QLinkAction) @@ -93,7 +96,9 @@ protected: explicit QLinkAction(QLinkActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkaction_p.h b/src/uml/qlinkaction_p.h index 2cd99467..b0e8a71a 100644 --- a/src/uml/qlinkaction_p.h +++ b/src/uml/qlinkaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QLinkEndData *> endData; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkendcreationdata.cpp b/src/uml/qlinkendcreationdata.cpp index 622cc113..fe96bdc4 100644 --- a/src/uml/qlinkendcreationdata.cpp +++ b/src/uml/qlinkendcreationdata.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLinkEndCreationDataPrivate::QLinkEndCreationDataPrivate() : isReplaceAll(false), @@ -142,24 +145,26 @@ void QLinkEndCreationData::setInsertAt(QInputPin *insertAt) void QLinkEndCreationData::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the existing links emanating from the object on this end should be destroyed before creating a new link."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies where the new link should be inserted for ordered association ends, or where an existing link should be moved to. The type of the input is UnlimitedNatural, but the input cannot be zero. This pin is omitted for association ends that are not ordered."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the existing links emanating from the object on this end should be destroyed before creating a new link."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies where the new link should be inserted for ordered association ends, or where an existing link should be moved to. The type of the input is UnlimitedNatural, but the input cannot be zero. This pin is omitted for association ends that are not ordered."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndCreationData")][QString::fromLatin1("insertAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLinkEndData::setPropertyData(); } -#include "moc_qlinkendcreationdata.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qlinkendcreationdata.cpp" diff --git a/src/uml/qlinkendcreationdata.h b/src/uml/qlinkendcreationdata.h index cb58fb6d..279a6e06 100644 --- a/src/uml/qlinkendcreationdata.h +++ b/src/uml/qlinkendcreationdata.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QLinkEndCreationData : public QLinkEndData Q_OBJECT Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) - Q_PROPERTY(QInputPin * insertAt READ insertAt WRITE setInsertAt) + Q_PROPERTY(QtUml::QInputPin * insertAt READ insertAt WRITE setInsertAt) Q_DISABLE_COPY(QLinkEndCreationData) Q_DECLARE_PRIVATE(QLinkEndCreationData) @@ -86,7 +89,9 @@ protected: explicit QLinkEndCreationData(QLinkEndCreationDataPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkendcreationdata_p.h b/src/uml/qlinkendcreationdata_p.h index 03a70d68..4533c929 100644 --- a/src/uml/qlinkendcreationdata_p.h +++ b/src/uml/qlinkendcreationdata_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *insertAt; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkenddata.cpp b/src/uml/qlinkenddata.cpp index 883bb320..83d9965a 100644 --- a/src/uml/qlinkenddata.cpp +++ b/src/uml/qlinkenddata.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLinkEndDataPrivate::QLinkEndDataPrivate() : value(0), @@ -169,31 +172,33 @@ void QLinkEndData::removeQualifier(QQualifierValue *qualifier) void QLinkEndData::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Input pin that provides the specified object for the given end. This pin is omitted if the link-end data specifies an 'open' end for reading."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Association end for which this link-end data specifies values."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("List of qualifier values"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Input pin that provides the specified object for the given end. This pin is omitted if the link-end data specifies an 'open' end for reading."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Association end for which this link-end data specifies values."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("end")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("List of qualifier values"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndData")][QString::fromLatin1("qualifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qlinkenddata.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qlinkenddata.cpp" diff --git a/src/uml/qlinkenddata.h b/src/uml/qlinkenddata.h index aae12bf1..f236f141 100644 --- a/src/uml/qlinkenddata.h +++ b/src/uml/qlinkenddata.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QLinkEndData : public QElement { Q_OBJECT - Q_PROPERTY(QInputPin * value READ value WRITE setValue) - Q_PROPERTY(QProperty * end READ end WRITE setEnd) - Q_PROPERTY(QSet<QQualifierValue *> qualifiers READ qualifiers) + Q_PROPERTY(QtUml::QInputPin * value READ value WRITE setValue) + Q_PROPERTY(QtUml::QProperty * end READ end WRITE setEnd) + Q_PROPERTY(QSet<QtUml::QQualifierValue *> qualifiers READ qualifiers) Q_DISABLE_COPY(QLinkEndData) Q_DECLARE_PRIVATE(QLinkEndData) @@ -92,7 +95,9 @@ protected: explicit QLinkEndData(QLinkEndDataPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkenddata_p.h b/src/uml/qlinkenddata_p.h index c5c8842f..f4ac0ae8 100644 --- a/src/uml/qlinkenddata_p.h +++ b/src/uml/qlinkenddata_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QSet<QQualifierValue *> qualifiers; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkenddestructiondata.cpp b/src/uml/qlinkenddestructiondata.cpp index 5e83d302..8bae03b7 100644 --- a/src/uml/qlinkenddestructiondata.cpp +++ b/src/uml/qlinkenddestructiondata.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLinkEndDestructionDataPrivate::QLinkEndDestructionDataPrivate() : isDestroyDuplicates(false), @@ -142,24 +145,26 @@ void QLinkEndDestructionData::setDestroyAt(QInputPin *destroyAt) void QLinkEndDestructionData::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether to destroy duplicates of the value in nonunique association ends."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the position of an existing link to be destroyed in ordered nonunique association ends. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether to destroy duplicates of the value in nonunique association ends."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the position of an existing link to be destroyed in ordered nonunique association ends. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLinkEndDestructionData")][QString::fromLatin1("destroyAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLinkEndData::setPropertyData(); } -#include "moc_qlinkenddestructiondata.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qlinkenddestructiondata.cpp" diff --git a/src/uml/qlinkenddestructiondata.h b/src/uml/qlinkenddestructiondata.h index 9cf18e50..6c70cac9 100644 --- a/src/uml/qlinkenddestructiondata.h +++ b/src/uml/qlinkenddestructiondata.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QLinkEndDestructionData : public QLinkEndData Q_OBJECT Q_PROPERTY(bool isDestroyDuplicates READ isDestroyDuplicates WRITE setDestroyDuplicates RESET unsetDestroyDuplicates) - Q_PROPERTY(QInputPin * destroyAt READ destroyAt WRITE setDestroyAt) + Q_PROPERTY(QtUml::QInputPin * destroyAt READ destroyAt WRITE setDestroyAt) Q_DISABLE_COPY(QLinkEndDestructionData) Q_DECLARE_PRIVATE(QLinkEndDestructionData) @@ -86,7 +89,9 @@ protected: explicit QLinkEndDestructionData(QLinkEndDestructionDataPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qlinkenddestructiondata_p.h b/src/uml/qlinkenddestructiondata_p.h index 23680126..965fd1e8 100644 --- a/src/uml/qlinkenddestructiondata_p.h +++ b/src/uml/qlinkenddestructiondata_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *destroyAt; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralboolean.cpp b/src/uml/qliteralboolean.cpp index 8798a17e..250d607f 100644 --- a/src/uml/qliteralboolean.cpp +++ b/src/uml/qliteralboolean.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLiteralBooleanPrivate::QLiteralBooleanPrivate() : value(false) @@ -134,17 +137,19 @@ bool QLiteralBoolean::isComputable() const void QLiteralBoolean::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Boolean value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Boolean value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralboolean.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qliteralboolean.cpp" diff --git a/src/uml/qliteralboolean.h b/src/uml/qliteralboolean.h index d916067c..1fbe7ce5 100644 --- a/src/uml/qliteralboolean.h +++ b/src/uml/qliteralboolean.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -82,7 +85,9 @@ protected: explicit QLiteralBoolean(QLiteralBooleanPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralboolean_p.h b/src/uml/qliteralboolean_p.h index 68d68de3..ecbb82ba 100644 --- a/src/uml/qliteralboolean_p.h +++ b/src/uml/qliteralboolean_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QLiteralBoolean; @@ -64,7 +67,9 @@ public: bool value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralinteger.cpp b/src/uml/qliteralinteger.cpp index 3e273983..23e2764e 100644 --- a/src/uml/qliteralinteger.cpp +++ b/src/uml/qliteralinteger.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLiteralIntegerPrivate::QLiteralIntegerPrivate() { @@ -125,17 +128,19 @@ bool QLiteralInteger::isComputable() const void QLiteralInteger::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Integer value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified Integer value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralinteger.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qliteralinteger.cpp" diff --git a/src/uml/qliteralinteger.h b/src/uml/qliteralinteger.h index c1316daf..557304da 100644 --- a/src/uml/qliteralinteger.h +++ b/src/uml/qliteralinteger.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -81,7 +84,9 @@ protected: explicit QLiteralInteger(QLiteralIntegerPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralinteger_p.h b/src/uml/qliteralinteger_p.h index a0a91867..500ee7f2 100644 --- a/src/uml/qliteralinteger_p.h +++ b/src/uml/qliteralinteger_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QLiteralInteger; @@ -64,7 +67,9 @@ public: qint32 value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralnull.cpp b/src/uml/qliteralnull.cpp index cc70813c..be5ec58d 100644 --- a/src/uml/qliteralnull.cpp +++ b/src/uml/qliteralnull.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLiteralNullPrivate::QLiteralNullPrivate() { @@ -103,7 +106,9 @@ void QLiteralNull::setPropertyData() QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralnull.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qliteralnull.cpp" diff --git a/src/uml/qliteralnull.h b/src/uml/qliteralnull.h index 404a250f..a4e5f701 100644 --- a/src/uml/qliteralnull.h +++ b/src/uml/qliteralnull.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,7 +78,9 @@ protected: explicit QLiteralNull(QLiteralNullPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralnull_p.h b/src/uml/qliteralnull_p.h index 35aa1baa..d98077c5 100644 --- a/src/uml/qliteralnull_p.h +++ b/src/uml/qliteralnull_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QLiteralNull; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralreal.cpp b/src/uml/qliteralreal.cpp index e01f99b8..bf09d1a8 100644 --- a/src/uml/qliteralreal.cpp +++ b/src/uml/qliteralreal.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLiteralRealPrivate::QLiteralRealPrivate() { @@ -122,17 +125,19 @@ qreal QLiteralReal::realValue() const void QLiteralReal::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralreal.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qliteralreal.cpp" diff --git a/src/uml/qliteralreal.h b/src/uml/qliteralreal.h index b6f5d31c..5c2a1388 100644 --- a/src/uml/qliteralreal.h +++ b/src/uml/qliteralreal.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -81,7 +84,9 @@ protected: explicit QLiteralReal(QLiteralRealPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralreal_p.h b/src/uml/qliteralreal_p.h index b5568130..bc82b0d8 100644 --- a/src/uml/qliteralreal_p.h +++ b/src/uml/qliteralreal_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QLiteralReal; @@ -64,7 +67,9 @@ public: qreal value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralspecification.cpp b/src/uml/qliteralspecification.cpp index b9efc289..b0068de5 100644 --- a/src/uml/qliteralspecification.cpp +++ b/src/uml/qliteralspecification.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLiteralSpecificationPrivate::QLiteralSpecificationPrivate() { @@ -83,7 +86,9 @@ void QLiteralSpecification::setPropertyData() QValueSpecification::setPropertyData(); } -#include "moc_qliteralspecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qliteralspecification.cpp" diff --git a/src/uml/qliteralspecification.h b/src/uml/qliteralspecification.h index 716a4c12..0f873b78 100644 --- a/src/uml/qliteralspecification.h +++ b/src/uml/qliteralspecification.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QLiteralSpecification(QLiteralSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralspecification_p.h b/src/uml/qliteralspecification_p.h index 3741549f..4d135f8f 100644 --- a/src/uml/qliteralspecification_p.h +++ b/src/uml/qliteralspecification_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralstring.cpp b/src/uml/qliteralstring.cpp index 83af0dc9..49c53e86 100644 --- a/src/uml/qliteralstring.cpp +++ b/src/uml/qliteralstring.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLiteralStringPrivate::QLiteralStringPrivate() { @@ -125,17 +128,19 @@ QString QLiteralString::stringValue() const void QLiteralString::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified String value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified String value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralstring.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qliteralstring.cpp" diff --git a/src/uml/qliteralstring.h b/src/uml/qliteralstring.h index 5b40de66..f4793bf8 100644 --- a/src/uml/qliteralstring.h +++ b/src/uml/qliteralstring.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -84,7 +87,9 @@ protected: explicit QLiteralString(QLiteralStringPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralstring_p.h b/src/uml/qliteralstring_p.h index 17adf394..0101c9fe 100644 --- a/src/uml/qliteralstring_p.h +++ b/src/uml/qliteralstring_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QLiteralString; @@ -67,7 +70,9 @@ public: QString value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralunlimitednatural.cpp b/src/uml/qliteralunlimitednatural.cpp index 249a91d4..cac153d8 100644 --- a/src/uml/qliteralunlimitednatural.cpp +++ b/src/uml/qliteralunlimitednatural.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLiteralUnlimitedNaturalPrivate::QLiteralUnlimitedNaturalPrivate() : value(0) @@ -134,17 +137,19 @@ qint32 QLiteralUnlimitedNatural::unlimitedValue() const void QLiteralUnlimitedNatural::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified UnlimitedNatural value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specified UnlimitedNatural value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLiteralSpecification::setPropertyData(); } -#include "moc_qliteralunlimitednatural.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qliteralunlimitednatural.cpp" diff --git a/src/uml/qliteralunlimitednatural.h b/src/uml/qliteralunlimitednatural.h index 23499e9c..1bca4d35 100644 --- a/src/uml/qliteralunlimitednatural.h +++ b/src/uml/qliteralunlimitednatural.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -82,7 +85,9 @@ protected: explicit QLiteralUnlimitedNatural(QLiteralUnlimitedNaturalPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qliteralunlimitednatural_p.h b/src/uml/qliteralunlimitednatural_p.h index c1af42c1..453f1991 100644 --- a/src/uml/qliteralunlimitednatural_p.h +++ b/src/uml/qliteralunlimitednatural_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QLiteralUnlimitedNatural; @@ -64,7 +67,9 @@ public: qint32 value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qloopnode.cpp b/src/uml/qloopnode.cpp index 802d6556..3509989d 100644 --- a/src/uml/qloopnode.cpp +++ b/src/uml/qloopnode.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QLoopNodePrivate::QLoopNodePrivate() : isTestedFirst(false), @@ -377,73 +380,75 @@ void QLoopNode::removeTest(QExecutableNode *test) void QLoopNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the test is performed before the first execution of the body. If false, the body is executed once before the test is performed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of values that are moved into the loop variable pins before the first iteration of the loop."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::structuredNodeInputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An output pin within the test fragment the value of which is examined after execution of the test to determine whether to execute the loop body."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins within the body fragment the values of which are moved to the loop variable pins after completion of execution of the body, before the next iteration of the loop begins or before the loop exits."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins that hold the values of the loop variables during an execution of the loop. When the test fails, the values are movied to the result pins of the loop."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins that constitute the data flow output of the entire loop."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::structuredNodeOutputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of nodes and edges that initialize values or perform other setup computations for the loop."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of nodes and edges that perform the repetitive computations of the loop. The body section is executed as long as the test section produces a true value."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the test is performed before the first execution of the body. If false, the body is executed once before the test is performed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of values that are moved into the loop variable pins before the first iteration of the loop."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::structuredNodeInputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariableInputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An output pin within the test fragment the value of which is examined after execution of the test to determine whether to execute the loop body."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("decider")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins within the body fragment the values of which are moved to the loop variable pins after completion of execution of the body, before the next iteration of the loop begins or before the loop exits."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyOutputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins that hold the values of the loop variables during an execution of the loop. When the test fails, the values are movied to the result pins of the loop."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("loopVariables")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of output pins that constitute the data flow output of the entire loop."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::structuredNodeOutputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of nodes and edges that initialize values or perform other setup computations for the loop."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("setupParts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of nodes and edges that perform the repetitive computations of the loop. The body section is executed as long as the test section produces a true value."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("bodyParts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of nodes, edges, and designated value that compute a Boolean value to determine if another execution of the body will be performed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QLoopNode")][QString::fromLatin1("tests")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QStructuredActivityNode::setPropertyData(); } -#include "moc_qloopnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qloopnode.cpp" diff --git a/src/uml/qloopnode.h b/src/uml/qloopnode.h index 6943d057..83efa6a1 100644 --- a/src/uml/qloopnode.h +++ b/src/uml/qloopnode.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,14 +71,14 @@ class Q_UML_EXPORT QLoopNode : public QStructuredActivityNode Q_OBJECT Q_PROPERTY(bool isTestedFirst READ isTestedFirst WRITE setTestedFirst RESET unsetTestedFirst) - Q_PROPERTY(QList<QInputPin *> loopVariableInputs READ loopVariableInputs) - Q_PROPERTY(QOutputPin * decider READ decider WRITE setDecider) - Q_PROPERTY(QList<QOutputPin *> bodyOutputs READ bodyOutputs) - Q_PROPERTY(QList<QOutputPin *> loopVariables READ loopVariables) - Q_PROPERTY(QList<QOutputPin *> results READ results) - Q_PROPERTY(QSet<QExecutableNode *> setupParts READ setupParts) - Q_PROPERTY(QSet<QExecutableNode *> bodyParts READ bodyParts) - Q_PROPERTY(QSet<QExecutableNode *> tests READ tests) + Q_PROPERTY(QList<QtUml::QInputPin *> loopVariableInputs READ loopVariableInputs) + Q_PROPERTY(QtUml::QOutputPin * decider READ decider WRITE setDecider) + Q_PROPERTY(QList<QtUml::QOutputPin *> bodyOutputs READ bodyOutputs) + Q_PROPERTY(QList<QtUml::QOutputPin *> loopVariables READ loopVariables) + Q_PROPERTY(QList<QtUml::QOutputPin *> results READ results) + Q_PROPERTY(QSet<QtUml::QExecutableNode *> setupParts READ setupParts) + Q_PROPERTY(QSet<QtUml::QExecutableNode *> bodyParts READ bodyParts) + Q_PROPERTY(QSet<QtUml::QExecutableNode *> tests READ tests) Q_DISABLE_COPY(QLoopNode) Q_DECLARE_PRIVATE(QLoopNode) @@ -120,7 +123,9 @@ protected: explicit QLoopNode(QLoopNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qloopnode_p.h b/src/uml/qloopnode_p.h index 821e781e..d1d9fc97 100644 --- a/src/uml/qloopnode_p.h +++ b/src/uml/qloopnode_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -81,7 +84,9 @@ public: QSet<QExecutableNode *> tests; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmanifestation.cpp b/src/uml/qmanifestation.cpp index 837702af..b771cb92 100644 --- a/src/uml/qmanifestation.cpp +++ b/src/uml/qmanifestation.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QManifestationPrivate::QManifestationPrivate() : utilizedElement(0) @@ -116,12 +119,12 @@ void QManifestation::setUtilizedElement(QPackageableElement *utilizedElement) void QManifestation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The model element that is utilized in the manifestation in an Artifact."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The model element that is utilized in the manifestation in an Artifact."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAbstraction::setPropertyData(); } @@ -139,7 +142,9 @@ void QManifestation::removeSupplier(QWrappedObjectPointer<QPackageableElement> u setUtilizedElement(0); } -#include "moc_qmanifestation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmanifestation.cpp" diff --git a/src/uml/qmanifestation.h b/src/uml/qmanifestation.h index 2bacbd44..932cab07 100644 --- a/src/uml/qmanifestation.h +++ b/src/uml/qmanifestation.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,7 +66,7 @@ class Q_UML_EXPORT QManifestation : public QAbstraction { Q_OBJECT - Q_PROPERTY(QPackageableElement * utilizedElement READ utilizedElement WRITE setUtilizedElement) + Q_PROPERTY(QtUml::QPackageableElement * utilizedElement READ utilizedElement WRITE setUtilizedElement) Q_DISABLE_COPY(QManifestation) Q_DECLARE_PRIVATE(QManifestation) @@ -86,7 +89,9 @@ protected: explicit QManifestation(QManifestationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmanifestation_p.h b/src/uml/qmanifestation_p.h index a4c0d183..f7efe06e 100644 --- a/src/uml/qmanifestation_p.h +++ b/src/uml/qmanifestation_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QPackageableElement *utilizedElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmergenode.cpp b/src/uml/qmergenode.cpp index 46271aa6..e82a3270 100644 --- a/src/uml/qmergenode.cpp +++ b/src/uml/qmergenode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QMergeNodePrivate::QMergeNodePrivate() { @@ -83,7 +86,9 @@ void QMergeNode::setPropertyData() QControlNode::setPropertyData(); } -#include "moc_qmergenode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmergenode.cpp" diff --git a/src/uml/qmergenode.h b/src/uml/qmergenode.h index f324ab29..15d1ead7 100644 --- a/src/uml/qmergenode.h +++ b/src/uml/qmergenode.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QMergeNode(QMergeNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmergenode_p.h b/src/uml/qmergenode_p.h index a552f88f..04794cd2 100644 --- a/src/uml/qmergenode_p.h +++ b/src/uml/qmergenode_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QMergeNode; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessage.cpp b/src/uml/qmessage.cpp index 975eaadd..3f5226db 100644 --- a/src/uml/qmessage.cpp +++ b/src/uml/qmessage.cpp @@ -49,10 +49,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QMessagePrivate::QMessagePrivate() : - messageSort(QtUml::MessageSynchCall), + messageSort(QtUmlNS::MessageSynchCall), signature(0), receiveEvent(0), interaction(0), @@ -96,7 +99,7 @@ QMessage::~QMessage() /*! The sort of communication reflected by the Message */ -QtUml::MessageSort QMessage::messageSort() const +QtUmlNS::MessageSort QMessage::messageSort() const { // This is a read-write attribute @@ -104,7 +107,7 @@ QtUml::MessageSort QMessage::messageSort() const return d->messageSort; } -void QMessage::setMessageSort(QtUml::MessageSort messageSort) +void QMessage::setMessageSort(QtUmlNS::MessageSort messageSort) { // This is a read-write attribute @@ -117,7 +120,7 @@ void QMessage::setMessageSort(QtUml::MessageSort messageSort) void QMessage::unsetMessageSort() { - setMessageSort(QtUml::MessageSynchCall); + setMessageSort(QtUmlNS::MessageSynchCall); Q_D(QMessage); d->modifiedResettableProperties.removeAll(QString::fromLatin1("messageSort")); } @@ -125,13 +128,13 @@ void QMessage::unsetMessageSort() /*! The derived kind of the Message (complete, lost, found or unknown) */ -QtUml::MessageKind QMessage::messageKind() const +QtUmlNS::MessageKind QMessage::messageKind() const { // This is a read-only derived attribute qWarning("QMessage::messageKind: to be implemented (this is a derived attribute)"); - return QtUml::MessageKind(); // change here to your derived return + return QtUmlNS::MessageKind(); // change here to your derived return } // --------------------------------------------------------------- @@ -293,66 +296,68 @@ void QMessage::setConnector(QConnector *connector) void QMessage::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The sort of communication reflected by the Message"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The derived kind of the Message (complete, lost, found or unknown)"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The signature of the Message is the specification of its content. It refers either an Operation or a Signal."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The arguments of the Message"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Receiving of the Message"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The enclosing Interaction owning the Message"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteraction::message"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Sending of the Message."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Connector on which this Message is sent."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The sort of communication reflected by the Message"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The derived kind of the Message (complete, lost, found or unknown)"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("messageKind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The signature of the Message is the specification of its content. It refers either an Operation or a Signal."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("signature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The arguments of the Message"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("arguments")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Receiving of the Message"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("receiveEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The enclosing Interaction owning the Message"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("interaction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInteraction::message"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Sending of the Message."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("sendEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Connector on which this Message is sent."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessage")][QString::fromLatin1("connector")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qmessage.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmessage.cpp" diff --git a/src/uml/qmessage.h b/src/uml/qmessage.h index db71c535..5581550d 100644 --- a/src/uml/qmessage.h +++ b/src/uml/qmessage.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,14 +74,14 @@ class Q_UML_EXPORT QMessage : public QNamedElement { Q_OBJECT - Q_PROPERTY(QtUml::MessageSort messageSort READ messageSort WRITE setMessageSort RESET unsetMessageSort) - Q_PROPERTY(QtUml::MessageKind messageKind READ messageKind STORED false) - Q_PROPERTY(QNamedElement * signature READ signature WRITE setSignature) - Q_PROPERTY(QList<QValueSpecification *> arguments READ arguments) - Q_PROPERTY(QMessageEnd * receiveEvent READ receiveEvent WRITE setReceiveEvent) - Q_PROPERTY(QInteraction * interaction READ interaction WRITE setInteraction) - Q_PROPERTY(QMessageEnd * sendEvent READ sendEvent WRITE setSendEvent) - Q_PROPERTY(QConnector * connector READ connector WRITE setConnector) + Q_PROPERTY(QtUmlNS::MessageSort messageSort READ messageSort WRITE setMessageSort RESET unsetMessageSort) + Q_PROPERTY(QtUmlNS::MessageKind messageKind READ messageKind STORED false) + Q_PROPERTY(QtUml::QNamedElement * signature READ signature WRITE setSignature) + Q_PROPERTY(QList<QtUml::QValueSpecification *> arguments READ arguments) + Q_PROPERTY(QtUml::QMessageEnd * receiveEvent READ receiveEvent WRITE setReceiveEvent) + Q_PROPERTY(QtUml::QInteraction * interaction READ interaction WRITE setInteraction) + Q_PROPERTY(QtUml::QMessageEnd * sendEvent READ sendEvent WRITE setSendEvent) + Q_PROPERTY(QtUml::QConnector * connector READ connector WRITE setConnector) Q_DISABLE_COPY(QMessage) Q_DECLARE_PRIVATE(QMessage) @@ -88,10 +91,10 @@ public: virtual ~QMessage(); // Attributes from QMessage - Q_INVOKABLE QtUml::MessageSort messageSort() const; - Q_INVOKABLE void setMessageSort(QtUml::MessageSort messageSort); + Q_INVOKABLE QtUmlNS::MessageSort messageSort() const; + Q_INVOKABLE void setMessageSort(QtUmlNS::MessageSort messageSort); Q_INVOKABLE void unsetMessageSort(); - Q_INVOKABLE QtUml::MessageKind messageKind() const; + Q_INVOKABLE QtUmlNS::MessageKind messageKind() const; // Association ends from QMessage Q_INVOKABLE QNamedElement *signature() const; @@ -114,7 +117,9 @@ protected: explicit QMessage(QMessagePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessage_p.h b/src/uml/qmessage_p.h index e94bb8d6..ee7ba35a 100644 --- a/src/uml/qmessage_p.h +++ b/src/uml/qmessage_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,7 @@ public: explicit QMessagePrivate(); virtual ~QMessagePrivate(); - QtUml::MessageSort messageSort; + QtUmlNS::MessageSort messageSort; QNamedElement *signature; QList<QValueSpecification *> arguments; QMessageEnd *receiveEvent; @@ -83,7 +86,9 @@ public: QConnector *connector; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessageend.cpp b/src/uml/qmessageend.cpp index dc0a9be5..ec1d16e0 100644 --- a/src/uml/qmessageend.cpp +++ b/src/uml/qmessageend.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QMessageEndPrivate::QMessageEndPrivate() : message(0) @@ -108,17 +111,19 @@ void QMessageEnd::setMessage(QMessage *message) void QMessageEnd::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a Message."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a Message."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qmessageend.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmessageend.cpp" diff --git a/src/uml/qmessageend.h b/src/uml/qmessageend.h index d04aaed5..bfef7740 100644 --- a/src/uml/qmessageend.h +++ b/src/uml/qmessageend.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QMessageEnd : public QNamedElement { Q_OBJECT - Q_PROPERTY(QMessage * message READ message WRITE setMessage) + Q_PROPERTY(QtUml::QMessage * message READ message WRITE setMessage) Q_DISABLE_COPY(QMessageEnd) Q_DECLARE_PRIVATE(QMessageEnd) @@ -80,7 +83,9 @@ protected: explicit QMessageEnd(QMessageEndPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessageend_p.h b/src/uml/qmessageend_p.h index f7d5f81f..5c99d4f6 100644 --- a/src/uml/qmessageend_p.h +++ b/src/uml/qmessageend_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,7 +69,9 @@ public: QMessage *message; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessageevent.cpp b/src/uml/qmessageevent.cpp index 174d5eff..5162eba4 100644 --- a/src/uml/qmessageevent.cpp +++ b/src/uml/qmessageevent.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QMessageEventPrivate::QMessageEventPrivate() { @@ -83,7 +86,9 @@ void QMessageEvent::setPropertyData() QEvent::setPropertyData(); } -#include "moc_qmessageevent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmessageevent.cpp" diff --git a/src/uml/qmessageevent.h b/src/uml/qmessageevent.h index efa03b24..9439e3b5 100644 --- a/src/uml/qmessageevent.h +++ b/src/uml/qmessageevent.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QMessageEvent(QMessageEventPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessageevent_p.h b/src/uml/qmessageevent_p.h index 04127744..b4bb689f 100644 --- a/src/uml/qmessageevent_p.h +++ b/src/uml/qmessageevent_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessageoccurrencespecification.cpp b/src/uml/qmessageoccurrencespecification.cpp index 1603a252..9fb75574 100644 --- a/src/uml/qmessageoccurrencespecification.cpp +++ b/src/uml/qmessageoccurrencespecification.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QMessageOccurrenceSpecificationPrivate::QMessageOccurrenceSpecificationPrivate() { @@ -140,12 +143,12 @@ void QMessageOccurrenceSpecification::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QMessageOccurrenceSpecification::visibility() const +QtUmlNS::VisibilityKind QMessageOccurrenceSpecification::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QMessageOccurrenceSpecification::setVisibility(QtUml::VisibilityKind visibility) +void QMessageOccurrenceSpecification::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -223,7 +226,9 @@ void QMessageOccurrenceSpecification::setPropertyData() QWrappedObject::setPropertyData(); } -#include "moc_qmessageoccurrencespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmessageoccurrencespecification.cpp" diff --git a/src/uml/qmessageoccurrencespecification.h b/src/uml/qmessageoccurrencespecification.h index 990a3b63..82e1d33a 100644 --- a/src/uml/qmessageoccurrencespecification.h +++ b/src/uml/qmessageoccurrencespecification.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -60,18 +63,18 @@ class Q_UML_EXPORT QMessageOccurrenceSpecification : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QMessage * message READ message WRITE setMessage) + Q_PROPERTY(QtUml::QMessage * message READ message WRITE setMessage) Q_DISABLE_COPY(QMessageOccurrenceSpecification) Q_DECLARE_PRIVATE(QMessageOccurrenceSpecification) @@ -90,8 +93,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -116,7 +119,9 @@ private: QMessageEnd *_wrappedMessageEnd; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmessageoccurrencespecification_p.h b/src/uml/qmessageoccurrencespecification_p.h index ede3b643..f71111ce 100644 --- a/src/uml/qmessageoccurrencespecification_p.h +++ b/src/uml/qmessageoccurrencespecification_p.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QMessageOccurrenceSpecification; @@ -65,7 +68,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmodel.cpp b/src/uml/qmodel.cpp index aeed8b13..5a27a3de 100644 --- a/src/uml/qmodel.cpp +++ b/src/uml/qmodel.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QModelPrivate::QModelPrivate() { @@ -105,17 +108,19 @@ void QModel::setViewpoint(QString viewpoint) void QModel::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The name of the viewpoint that is expressed by a model (This name may refer to a profile definition)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The name of the viewpoint that is expressed by a model (This name may refer to a profile definition)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QPackage::setPropertyData(); } -#include "moc_qmodel.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmodel.cpp" diff --git a/src/uml/qmodel.h b/src/uml/qmodel.h index 364be62d..da4f9cc1 100644 --- a/src/uml/qmodel.h +++ b/src/uml/qmodel.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -80,7 +83,9 @@ protected: explicit QModel(QModelPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmodel_p.h b/src/uml/qmodel_p.h index 537afd66..0b45dd2a 100644 --- a/src/uml/qmodel_p.h +++ b/src/uml/qmodel_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QModel; @@ -67,7 +70,9 @@ public: QString viewpoint; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmultiplicityelement.cpp b/src/uml/qmultiplicityelement.cpp index ed7ab593..21f5b232 100644 --- a/src/uml/qmultiplicityelement.cpp +++ b/src/uml/qmultiplicityelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QMultiplicityElementPrivate::QMultiplicityElementPrivate() : isUnique(true), @@ -340,52 +343,54 @@ qint32 QMultiplicityElement::upperBound() const void QMultiplicityElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the upper bound of the multiplicity interval."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attributes specifies whether the values in an instantiation of this element are unique."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attribute specifies whether the values in an instantiation of this element are sequentially ordered."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the lower bound of the multiplicity interval."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the upper bound for this multiplicity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the lower bound for this multiplicity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the upper bound of the multiplicity interval."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attributes specifies whether the values in an instantiation of this element are unique."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("For a multivalued multiplicity, this attribute specifies whether the values in an instantiation of this element are sequentially ordered."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the lower bound of the multiplicity interval."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the upper bound for this multiplicity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("upperValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specification of the lower bound for this multiplicity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QMultiplicityElement")][QString::fromLatin1("lowerValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qmultiplicityelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qmultiplicityelement.cpp" diff --git a/src/uml/qmultiplicityelement.h b/src/uml/qmultiplicityelement.h index d2f4279d..636ec18f 100644 --- a/src/uml/qmultiplicityelement.h +++ b/src/uml/qmultiplicityelement.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QMultiplicityElement : public QElement Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtUml::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtUml::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_DISABLE_COPY(QMultiplicityElement) Q_DECLARE_PRIVATE(QMultiplicityElement) @@ -109,7 +112,9 @@ protected: explicit QMultiplicityElement(QMultiplicityElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qmultiplicityelement_p.h b/src/uml/qmultiplicityelement_p.h index ad368a98..df9db6fd 100644 --- a/src/uml/qmultiplicityelement_p.h +++ b/src/uml/qmultiplicityelement_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QValueSpecification *lowerValue; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qnamedelement.cpp b/src/uml/qnamedelement.cpp index 1b8c93d9..3c74570c 100644 --- a/src/uml/qnamedelement.cpp +++ b/src/uml/qnamedelement.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QNamedElementPrivate::QNamedElementPrivate() : nameExpression(0), @@ -140,7 +143,7 @@ void QNamedElement::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QNamedElement::visibility() const +QtUmlNS::VisibilityKind QNamedElement::visibility() const { // This is a read-write attribute @@ -148,7 +151,7 @@ QtUml::VisibilityKind QNamedElement::visibility() const return d->visibility; } -void QNamedElement::setVisibility(QtUml::VisibilityKind visibility) +void QNamedElement::setVisibility(QtUmlNS::VisibilityKind visibility) { // This is a read-write attribute @@ -312,52 +315,54 @@ QString QNamedElement::separator() const void QNamedElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The name of the NamedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A name which allows the NamedElement to be identified within a hierarchy of nested Namespaces. It is constructed from the names of the containing namespaces starting at the root of the hierarchy and ending with the name of the NamedElement itself."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The string expression used to define the name of this named element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedMember"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the dependencies that reference the client."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDependency::client"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The name of the NamedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A name which allows the NamedElement to be identified within a hierarchy of nested Namespaces. It is constructed from the names of the containing namespaces starting at the root of the hierarchy and ending with the name of the NamedElement itself."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("qualifiedName")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The string expression used to define the name of this named element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("nameExpression")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the namespace that owns the NamedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("namespace_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::ownedMember"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the dependencies that reference the client."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamedElement")][QString::fromLatin1("clientDependencies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDependency::client"); QElement::setPropertyData(); } -#include "moc_qnamedelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qnamedelement.cpp" diff --git a/src/uml/qnamedelement.h b/src/uml/qnamedelement.h index 2f2b233e..23b2706d 100644 --- a/src/uml/qnamedelement.h +++ b/src/uml/qnamedelement.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,11 +76,11 @@ class Q_UML_EXPORT QNamedElement : public QElement Q_OBJECT Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) Q_DISABLE_COPY(QNamedElement) Q_DECLARE_PRIVATE(QNamedElement) @@ -89,8 +92,8 @@ public: // Attributes from QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from QNamedElement @@ -116,7 +119,9 @@ protected: explicit QNamedElement(QNamedElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qnamedelement_p.h b/src/uml/qnamedelement_p.h index 8887a386..1e5cbf2f 100644 --- a/src/uml/qnamedelement_p.h +++ b/src/uml/qnamedelement_p.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -76,7 +79,7 @@ public: virtual ~QNamedElementPrivate(); QString name; - QtUml::VisibilityKind visibility; + QtUmlNS::VisibilityKind visibility; QStringExpression *nameExpression; QNamespace *namespace_; QSet<QDependency *> clientDependencies; @@ -85,7 +88,9 @@ public: void setNamespace_(QNamespace *namespace_); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qnamespace.cpp b/src/uml/qnamespace.cpp index 58263393..46f181e1 100644 --- a/src/uml/qnamespace.cpp +++ b/src/uml/qnamespace.cpp @@ -52,7 +52,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QNamespacePrivate::QNamespacePrivate() { @@ -375,52 +378,54 @@ bool QNamespace::membersAreDistinguishable() const void QNamespace::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageImports owned by the Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageImport::importingNamespace"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ElementImports owned by the Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElementImport::importingNamespace"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a set of Constraints owned by this Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConstraint::context"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements owned by the Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageImports owned by the Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageImport::importingNamespace"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements identifiable within the Namespace, either by being owned or by being introduced by importing or inheritance."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("members")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageableElements that are members of this Namespace as a result of either PackageImports or ElementImports."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("importedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ElementImports owned by the Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("elementImports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QElementImport::importingNamespace"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a set of Constraints owned by this Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedRules")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConstraint::context"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A collection of NamedElements owned by the Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNamespace")][QString::fromLatin1("ownedMembers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamedElement::namespace"); QNamedElement::setPropertyData(); } -#include "moc_qnamespace.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qnamespace.cpp" diff --git a/src/uml/qnamespace.h b/src/uml/qnamespace.h index 30562d5b..acf1c428 100644 --- a/src/uml/qnamespace.h +++ b/src/uml/qnamespace.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,12 +71,12 @@ class Q_UML_EXPORT QNamespace : public QNamedElement { Q_OBJECT - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) Q_DISABLE_COPY(QNamespace) Q_DECLARE_PRIVATE(QNamespace) @@ -111,7 +114,9 @@ protected: explicit QNamespace(QNamespacePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qnamespace_p.h b/src/uml/qnamespace_p.h index c8cd1df0..f39d39e3 100644 --- a/src/uml/qnamespace_p.h +++ b/src/uml/qnamespace_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -83,7 +86,9 @@ public: void removeOwnedMember(QNamedElement *ownedMember); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qnode.cpp b/src/uml/qnode.cpp index 0d57530a..8afb195f 100644 --- a/src/uml/qnode.cpp +++ b/src/uml/qnode.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QNodePrivate::QNodePrivate() { @@ -140,12 +143,12 @@ void QNode::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QNode::visibility() const +QtUmlNS::VisibilityKind QNode::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QNode::setVisibility(QtUml::VisibilityKind visibility) +void QNode::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -274,17 +277,19 @@ void QNode::removeNestedNode(QNode *nestedNode) void QNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Nodes that are defined (nested) within the Node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Nodes that are defined (nested) within the Node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qnode.cpp" diff --git a/src/uml/qnode.h b/src/uml/qnode.h index 22d289a4..5d6ab5be 100644 --- a/src/uml/qnode.h +++ b/src/uml/qnode.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,21 +66,21 @@ class Q_UML_EXPORT QNode : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageableElement *> deployedElements READ deployedElements STORED false) - Q_PROPERTY(QSet<QDeployment *> deployments READ deployments) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> deployedElements READ deployedElements STORED false) + Q_PROPERTY(QSet<QtUml::QDeployment *> deployments READ deployments) - Q_PROPERTY(QSet<QNode *> nestedNodes READ nestedNodes) + Q_PROPERTY(QSet<QtUml::QNode *> nestedNodes READ nestedNodes) Q_DISABLE_COPY(QNode) Q_DECLARE_PRIVATE(QNode) @@ -96,8 +99,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -129,7 +132,9 @@ private: QDeploymentTarget *_wrappedDeploymentTarget; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qnode_p.h b/src/uml/qnode_p.h index 653fb046..0157d561 100644 --- a/src/uml/qnode_p.h +++ b/src/uml/qnode_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QSet<QNode *> nestedNodes; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qobjectflow.cpp b/src/uml/qobjectflow.cpp index 5a162f08..6c9fdffc 100644 --- a/src/uml/qobjectflow.cpp +++ b/src/uml/qobjectflow.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QObjectFlowPrivate::QObjectFlowPrivate() : isMultireceive(false), @@ -194,38 +197,40 @@ void QObjectFlow::setTransformation(QBehavior *transformation) void QObjectFlow::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the objects in the flow are gathered from respondents to multicasting."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the objects in the flow are passed by multicasting."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Selects tokens from a source object node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Changes or replaces data tokens flowing along edge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the objects in the flow are gathered from respondents to multicasting."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the objects in the flow are passed by multicasting."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("isMulticast")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Selects tokens from a source object node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("selection")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Changes or replaces data tokens flowing along edge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectFlow")][QString::fromLatin1("transformation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QActivityEdge::setPropertyData(); } -#include "moc_qobjectflow.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qobjectflow.cpp" diff --git a/src/uml/qobjectflow.h b/src/uml/qobjectflow.h index a87d5905..5a2ade3a 100644 --- a/src/uml/qobjectflow.h +++ b/src/uml/qobjectflow.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,8 +66,8 @@ class Q_UML_EXPORT QObjectFlow : public QActivityEdge Q_PROPERTY(bool isMultireceive READ isMultireceive WRITE setMultireceive RESET unsetMultireceive) Q_PROPERTY(bool isMulticast READ isMulticast WRITE setMulticast RESET unsetMulticast) - Q_PROPERTY(QBehavior * selection READ selection WRITE setSelection) - Q_PROPERTY(QBehavior * transformation READ transformation WRITE setTransformation) + Q_PROPERTY(QtUml::QBehavior * selection READ selection WRITE setSelection) + Q_PROPERTY(QtUml::QBehavior * transformation READ transformation WRITE setTransformation) Q_DISABLE_COPY(QObjectFlow) Q_DECLARE_PRIVATE(QObjectFlow) @@ -93,7 +96,9 @@ protected: explicit QObjectFlow(QObjectFlowPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qobjectflow_p.h b/src/uml/qobjectflow_p.h index 90dcd1c7..36f0d380 100644 --- a/src/uml/qobjectflow_p.h +++ b/src/uml/qobjectflow_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QBehavior *transformation; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qobjectnode.cpp b/src/uml/qobjectnode.cpp index 48baeb6f..d38fa5e7 100644 --- a/src/uml/qobjectnode.cpp +++ b/src/uml/qobjectnode.cpp @@ -48,11 +48,14 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QObjectNodePrivate::QObjectNodePrivate() : isControlType(false), - ordering(QtUml::ObjectNodeOrderingFIFO), + ordering(QtUmlNS::ObjectNodeOrderingFIFO), upperBound(0), selection(0) { @@ -148,12 +151,12 @@ void QObjectNode::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QObjectNode::visibility() const +QtUmlNS::VisibilityKind QObjectNode::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QObjectNode::setVisibility(QtUml::VisibilityKind visibility) +void QObjectNode::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -434,7 +437,7 @@ void QObjectNode::unsetControlType() /*! Tells whether and how the tokens in the object node are ordered for selection to traverse edges outgoing from the object node. */ -QtUml::ObjectNodeOrderingKind QObjectNode::ordering() const +QtUmlNS::ObjectNodeOrderingKind QObjectNode::ordering() const { // This is a read-write attribute @@ -442,7 +445,7 @@ QtUml::ObjectNodeOrderingKind QObjectNode::ordering() const return d->ordering; } -void QObjectNode::setOrdering(QtUml::ObjectNodeOrderingKind ordering) +void QObjectNode::setOrdering(QtUmlNS::ObjectNodeOrderingKind ordering) { // This is a read-write attribute @@ -455,7 +458,7 @@ void QObjectNode::setOrdering(QtUml::ObjectNodeOrderingKind ordering) void QObjectNode::unsetOrdering() { - setOrdering(QtUml::ObjectNodeOrderingFIFO); + setOrdering(QtUmlNS::ObjectNodeOrderingFIFO); Q_D(QObjectNode); d->modifiedResettableProperties.removeAll(QString::fromLatin1("ordering")); } @@ -547,45 +550,47 @@ void QObjectNode::removeInState(QState *inState) void QObjectNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the type of the object node is to be treated as control."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether and how the tokens in the object node are ordered for selection to traverse edges outgoing from the object node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The maximum number of tokens allowed in the node. Objects cannot flow into the node if the upper bound is reached."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Selects tokens for outgoing edges."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The required states of the object available at this point in the activity."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the type of the object node is to be treated as control."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether and how the tokens in the object node are ordered for selection to traverse edges outgoing from the object node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("ordering")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The maximum number of tokens allowed in the node. Objects cannot flow into the node if the upper bound is reached."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("upperBound")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Selects tokens for outgoing edges."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("selection")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The required states of the object available at this point in the activity."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QObjectNode")][QString::fromLatin1("inState")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qobjectnode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qobjectnode.cpp" diff --git a/src/uml/qobjectnode.h b/src/uml/qobjectnode.h index 6c731c5c..ee34d983 100644 --- a/src/uml/qobjectnode.h +++ b/src/uml/qobjectnode.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,37 +74,37 @@ class Q_UML_EXPORT QObjectNode : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QActivityNode *> redefinedNodes READ redefinedNodes) - Q_PROPERTY(QSet<QActivityEdge *> incomings READ incomings) - Q_PROPERTY(QActivity * activity READ activity WRITE setActivity) - Q_PROPERTY(QSet<QActivityGroup *> inGroup READ inGroup) - Q_PROPERTY(QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) - Q_PROPERTY(QSet<QActivityPartition *> inPartition READ inPartition) - Q_PROPERTY(QSet<QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) - Q_PROPERTY(QSet<QActivityEdge *> outgoings READ outgoings) + Q_PROPERTY(QSet<QtUml::QActivityNode *> redefinedNodes READ redefinedNodes) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> incomings READ incomings) + Q_PROPERTY(QtUml::QActivity * activity READ activity WRITE setActivity) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> inGroup READ inGroup) + Q_PROPERTY(QtUml::QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) + Q_PROPERTY(QSet<QtUml::QActivityPartition *> inPartition READ inPartition) + Q_PROPERTY(QSet<QtUml::QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> outgoings READ outgoings) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType) - Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering) - Q_PROPERTY(QValueSpecification * upperBound READ upperBound WRITE setUpperBound) - Q_PROPERTY(QBehavior * selection READ selection WRITE setSelection) - Q_PROPERTY(QSet<QState *> inState READ inState) + Q_PROPERTY(QtUmlNS::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering) + Q_PROPERTY(QtUml::QValueSpecification * upperBound READ upperBound WRITE setUpperBound) + Q_PROPERTY(QtUml::QBehavior * selection READ selection WRITE setSelection) + Q_PROPERTY(QSet<QtUml::QState *> inState READ inState) Q_DISABLE_COPY(QObjectNode) Q_DECLARE_PRIVATE(QObjectNode) @@ -120,8 +123,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -171,8 +174,8 @@ public: Q_INVOKABLE bool isControlType() const; Q_INVOKABLE void setControlType(bool isControlType); Q_INVOKABLE void unsetControlType(); - Q_INVOKABLE QtUml::ObjectNodeOrderingKind ordering() const; - Q_INVOKABLE void setOrdering(QtUml::ObjectNodeOrderingKind ordering); + Q_INVOKABLE QtUmlNS::ObjectNodeOrderingKind ordering() const; + Q_INVOKABLE void setOrdering(QtUmlNS::ObjectNodeOrderingKind ordering); Q_INVOKABLE void unsetOrdering(); // Association ends from QObjectNode @@ -194,7 +197,9 @@ private: QTypedElement *_wrappedTypedElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qobjectnode_p.h b/src/uml/qobjectnode_p.h index a5f3477e..973a10eb 100644 --- a/src/uml/qobjectnode_p.h +++ b/src/uml/qobjectnode_p.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,13 +77,15 @@ public: virtual ~QObjectNodePrivate(); bool isControlType; - QtUml::ObjectNodeOrderingKind ordering; + QtUmlNS::ObjectNodeOrderingKind ordering; QValueSpecification *upperBound; QBehavior *selection; QSet<QState *> inState; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qobservation.cpp b/src/uml/qobservation.cpp index d67bf895..50b89b97 100644 --- a/src/uml/qobservation.cpp +++ b/src/uml/qobservation.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QObservationPrivate::QObservationPrivate() { @@ -83,7 +86,9 @@ void QObservation::setPropertyData() QPackageableElement::setPropertyData(); } -#include "moc_qobservation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qobservation.cpp" diff --git a/src/uml/qobservation.h b/src/uml/qobservation.h index 2b56ac30..bd761c10 100644 --- a/src/uml/qobservation.h +++ b/src/uml/qobservation.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QObservation(QObservationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qobservation_p.h b/src/uml/qobservation_p.h index 2f9c06e7..ae5c2146 100644 --- a/src/uml/qobservation_p.h +++ b/src/uml/qobservation_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoccurrencespecification.cpp b/src/uml/qoccurrencespecification.cpp index e54400c9..c10f929e 100644 --- a/src/uml/qoccurrencespecification.cpp +++ b/src/uml/qoccurrencespecification.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QOccurrenceSpecificationPrivate::QOccurrenceSpecificationPrivate() : covered(0) @@ -191,31 +194,33 @@ void QOccurrenceSpecification::removeToBefore(QGeneralOrdering *toBefore) void QOccurrenceSpecification::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Lifeline on which the OccurrenceSpecification appears."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInteractionFragment::covered"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralOrdering::before"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralOrdering::after"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Lifeline on which the OccurrenceSpecification appears."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInteractionFragment::covered"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the GeneralOrderings that specify EventOcurrences that must occur after this OccurrenceSpecification"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toAfter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralOrdering::before"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the GeneralOrderings that specify EventOcurrences that must occur before this OccurrenceSpecification"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOccurrenceSpecification")][QString::fromLatin1("toBefore")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QGeneralOrdering::after"); QInteractionFragment::setPropertyData(); } -#include "moc_qoccurrencespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qoccurrencespecification.cpp" diff --git a/src/uml/qoccurrencespecification.h b/src/uml/qoccurrencespecification.h index 91aa2312..f3fa1ac2 100644 --- a/src/uml/qoccurrencespecification.h +++ b/src/uml/qoccurrencespecification.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,9 +68,9 @@ class Q_UML_EXPORT QOccurrenceSpecification : public QInteractionFragment { Q_OBJECT - Q_PROPERTY(QLifeline * covered READ covered WRITE setCovered) - Q_PROPERTY(QSet<QGeneralOrdering *> toAfter READ toAfter) - Q_PROPERTY(QSet<QGeneralOrdering *> toBefore READ toBefore) + Q_PROPERTY(QtUml::QLifeline * covered READ covered WRITE setCovered) + Q_PROPERTY(QSet<QtUml::QGeneralOrdering *> toAfter READ toAfter) + Q_PROPERTY(QSet<QtUml::QGeneralOrdering *> toBefore READ toBefore) Q_DISABLE_COPY(QOccurrenceSpecification) Q_DECLARE_PRIVATE(QOccurrenceSpecification) @@ -92,7 +95,9 @@ protected: explicit QOccurrenceSpecification(QOccurrenceSpecificationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoccurrencespecification_p.h b/src/uml/qoccurrencespecification_p.h index 78c16c0f..d3d00299 100644 --- a/src/uml/qoccurrencespecification_p.h +++ b/src/uml/qoccurrencespecification_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QSet<QGeneralOrdering *> toBefore; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qopaqueaction.cpp b/src/uml/qopaqueaction.cpp index ec34122f..9440855d 100644 --- a/src/uml/qopaqueaction.cpp +++ b/src/uml/qopaqueaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QOpaqueActionPrivate::QOpaqueActionPrivate() { @@ -227,38 +230,40 @@ void QOpaqueAction::removeOutputValue(QOutputPin *outputValue) void QOpaqueAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the action in one or more languages."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Languages the body strings use, in the same order as the body strings"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides input to the action."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Takes output from the action."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the action in one or more languages."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Languages the body strings use, in the same order as the body strings"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides input to the action."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Takes output from the action."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueAction")][QString::fromLatin1("outputValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qopaqueaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qopaqueaction.cpp" diff --git a/src/uml/qopaqueaction.h b/src/uml/qopaqueaction.h index 571d8ddf..f4f4e528 100644 --- a/src/uml/qopaqueaction.h +++ b/src/uml/qopaqueaction.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,8 +72,8 @@ class Q_UML_EXPORT QOpaqueAction : public QAction Q_PROPERTY(QList<QString> bodies READ bodies) Q_PROPERTY(QList<QString> languages READ languages) - Q_PROPERTY(QSet<QInputPin *> inputValues READ inputValues) - Q_PROPERTY(QSet<QOutputPin *> outputValues READ outputValues) + Q_PROPERTY(QSet<QtUml::QInputPin *> inputValues READ inputValues) + Q_PROPERTY(QSet<QtUml::QOutputPin *> outputValues READ outputValues) Q_DISABLE_COPY(QOpaqueAction) Q_DECLARE_PRIVATE(QOpaqueAction) @@ -101,7 +104,9 @@ protected: explicit QOpaqueAction(QOpaqueActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qopaqueaction_p.h b/src/uml/qopaqueaction_p.h index cb9cbe11..489c19be 100644 --- a/src/uml/qopaqueaction_p.h +++ b/src/uml/qopaqueaction_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -76,7 +79,9 @@ public: QSet<QOutputPin *> outputValues; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qopaquebehavior.cpp b/src/uml/qopaquebehavior.cpp index 44ef5f4b..b22f0631 100644 --- a/src/uml/qopaquebehavior.cpp +++ b/src/uml/qopaquebehavior.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QOpaqueBehaviorPrivate::QOpaqueBehaviorPrivate() { @@ -146,24 +149,26 @@ void QOpaqueBehavior::removeBody(QString body) void QOpaqueBehavior::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Languages the body strings use in the same order as the body strings."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the behavior in one or more languages."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Languages the body strings use in the same order as the body strings."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the behavior in one or more languages."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueBehavior")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QBehavior::setPropertyData(); } -#include "moc_qopaquebehavior.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qopaquebehavior.cpp" diff --git a/src/uml/qopaquebehavior.h b/src/uml/qopaquebehavior.h index 83f47b4a..1f7463dc 100644 --- a/src/uml/qopaquebehavior.h +++ b/src/uml/qopaquebehavior.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -86,7 +89,9 @@ protected: explicit QOpaqueBehavior(QOpaqueBehaviorPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qopaquebehavior_p.h b/src/uml/qopaquebehavior_p.h index 8d97d5d2..2d0bf912 100644 --- a/src/uml/qopaquebehavior_p.h +++ b/src/uml/qopaquebehavior_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QOpaqueBehavior; @@ -69,7 +72,9 @@ public: QList<QString> bodies; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qopaqueexpression.cpp b/src/uml/qopaqueexpression.cpp index 7ca7686d..70a81b83 100644 --- a/src/uml/qopaqueexpression.cpp +++ b/src/uml/qopaqueexpression.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QOpaqueExpressionPrivate::QOpaqueExpressionPrivate() : behavior(0) @@ -227,38 +230,40 @@ qint32 QOpaqueExpression::value() const void QOpaqueExpression::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The text of the expression, possibly in multiple languages."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the behavior of the opaque expression."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Restricts an opaque expression to return exactly one return result. When the invocation of the opaque expression completes, a single set of values is returned to its owner. This association is derived from the single return result parameter of the associated behavior."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The text of the expression, possibly in multiple languages."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the languages in which the expression is stated. The interpretation of the expression body depends on the languages. If the languages are unspecified, they might be implicit from the expression body or the context. Languages are matched to body strings by order."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("languages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the behavior of the opaque expression."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("behavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Restricts an opaque expression to return exactly one return result. When the invocation of the opaque expression completes, a single set of values is returned to its owner. This association is derived from the single return result parameter of the associated behavior."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOpaqueExpression")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qopaqueexpression.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qopaqueexpression.cpp" diff --git a/src/uml/qopaqueexpression.h b/src/uml/qopaqueexpression.h index 3516ec6b..69a67f45 100644 --- a/src/uml/qopaqueexpression.h +++ b/src/uml/qopaqueexpression.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,8 +71,8 @@ class Q_UML_EXPORT QOpaqueExpression : public QValueSpecification Q_PROPERTY(QList<QString> bodies READ bodies) Q_PROPERTY(QList<QString> languages READ languages) - Q_PROPERTY(QBehavior * behavior READ behavior WRITE setBehavior) - Q_PROPERTY(QParameter * result READ result STORED false) + Q_PROPERTY(QtUml::QBehavior * behavior READ behavior WRITE setBehavior) + Q_PROPERTY(QtUml::QParameter * result READ result STORED false) Q_DISABLE_COPY(QOpaqueExpression) Q_DECLARE_PRIVATE(QOpaqueExpression) @@ -103,7 +106,9 @@ protected: explicit QOpaqueExpression(QOpaqueExpressionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qopaqueexpression_p.h b/src/uml/qopaqueexpression_p.h index d8802c1a..b9f5f647 100644 --- a/src/uml/qopaqueexpression_p.h +++ b/src/uml/qopaqueexpression_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QBehavior *behavior; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoperation.cpp b/src/uml/qoperation.cpp index 2bc1b437..6276c34b 100644 --- a/src/uml/qoperation.cpp +++ b/src/uml/qoperation.cpp @@ -53,7 +53,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QOperationPrivate::QOperationPrivate() : isQuery(false), @@ -192,12 +195,12 @@ void QOperation::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QOperation::visibility() const +QtUmlNS::VisibilityKind QOperation::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QOperation::setVisibility(QtUml::VisibilityKind visibility) +void QOperation::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -422,19 +425,19 @@ QSet<QClassifier *> QOperation::featuringClassifiers() const /*! Specifies the semantics of concurrent calls to the same passive instance (i.e., an instance originating from a class with isActive being false). Active instances control access to their own behavioral features. */ -QtUml::CallConcurrencyKind QOperation::concurrency() const +QtUmlNS::CallConcurrencyKind QOperation::concurrency() const { return (qwrappedobject_cast<const QBehavioralFeature *>(this))->concurrency(); } -void QOperation::setConcurrency(QtUml::CallConcurrencyKind concurrency) +void QOperation::setConcurrency(QtUmlNS::CallConcurrencyKind concurrency) { (qwrappedobject_cast<QBehavioralFeature *>(this))->setConcurrency(concurrency); } void QOperation::unsetConcurrency() { - setConcurrency(QtUml::CallConcurrencySequential); + setConcurrency(QtUmlNS::CallConcurrencySequential); Q_D(QOperation); d->modifiedResettableProperties.removeAll(QString::fromLatin1("concurrency")); } @@ -1013,122 +1016,124 @@ QSet<QParameter *> QOperation::returnResult() const void QOperation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies the lower multiplicity of the return parameter, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether an execution of the BehavioralFeature leaves the state of the system unchanged (isQuery=true) or whether side effects may occur (isQuery=false)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the return parameter is unique or not, if present.This information is derived from the return result for this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies the upper multiplicity of the return parameter, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies whether the return parameter is ordered or not, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the ordered set of formal parameters of this BehavioralFeature.Specifies the parameters owned by this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::ownedParameters"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameter::operation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional Constraint on the result values of an invocation of this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operations that are redefined by this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying the state of the system when the Operation is completed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedOperation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template parameter that exposes this element as a formal parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperationTemplateParameter::parameteredElement"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Interface that owns this Operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterface::ownedOperation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies the return result of the operation, if present."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints on the state of the system when the Operation is invoked."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The class that owns the operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedOperation"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this operation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::raisedExceptions"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies the lower multiplicity of the return parameter, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether an execution of the BehavioralFeature leaves the state of the system unchanged (isQuery=true) or whether side effects may occur (isQuery=false)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isQuery")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the return parameter is unique or not, if present.This information is derived from the return result for this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isUnique")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies the upper multiplicity of the return parameter, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("upper")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies whether the return parameter is ordered or not, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the ordered set of formal parameters of this BehavioralFeature.Specifies the parameters owned by this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::ownedParameters"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameter::operation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional Constraint on the result values of an invocation of this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("bodyCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operations that are redefined by this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("redefinedOperations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints specifying the state of the system when the Operation is completed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("postconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedOperation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template parameter that exposes this element as a formal parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperationTemplateParameter::parameteredElement"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The Interface that owns this Operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("interface_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterface::ownedOperation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.Specifies the return result of the operation, if present."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional set of Constraints on the state of the system when the Operation is invoked."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("preconditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The class that owns the operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedOperation"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Types representing exceptions that may be raised during an invocation of this operation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavioralFeature::raisedExceptions"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperation")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qoperation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qoperation.cpp" diff --git a/src/uml/qoperation.h b/src/uml/qoperation.h index dab88374..3dd91146 100644 --- a/src/uml/qoperation.h +++ b/src/uml/qoperation.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,57 +78,57 @@ class Q_UML_EXPORT QOperation : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QtUml::QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtUml::QClassifier *> featuringClassifiers READ featuringClassifiers) - Q_PROPERTY(QtUml::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency) + Q_PROPERTY(QtUmlNS::CallConcurrencyKind concurrency READ concurrency WRITE setConcurrency RESET unsetConcurrency) Q_PROPERTY(bool isAbstract READ isAbstract WRITE setAbstract RESET unsetAbstract) - Q_PROPERTY(QSet<QParameterSet *> ownedParameterSets READ ownedParameterSets) - Q_PROPERTY(QSet<QBehavior *> methods READ methods) + Q_PROPERTY(QSet<QtUml::QParameterSet *> ownedParameterSets READ ownedParameterSets) + Q_PROPERTY(QSet<QtUml::QBehavior *> methods READ methods) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) Q_PROPERTY(qint32 lower READ lower STORED false) Q_PROPERTY(bool isQuery READ isQuery WRITE setQuery RESET unsetQuery) Q_PROPERTY(bool isUnique READ isUnique STORED false) Q_PROPERTY(qint32 upper READ upper STORED false) Q_PROPERTY(bool isOrdered READ isOrdered STORED false) - Q_PROPERTY(QList<QParameter *> ownedParameters READ ownedParameters) - Q_PROPERTY(QConstraint * bodyCondition READ bodyCondition WRITE setBodyCondition) - Q_PROPERTY(QSet<QOperation *> redefinedOperations READ redefinedOperations) - Q_PROPERTY(QSet<QConstraint *> postconditions READ postconditions) - Q_PROPERTY(QDataType * datatype READ datatype WRITE setDatatype) - Q_PROPERTY(QOperationTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QInterface * interface_ READ interface_ WRITE setInterface_) - Q_PROPERTY(QType * type READ type STORED false) - Q_PROPERTY(QSet<QConstraint *> preconditions READ preconditions) - Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) - Q_PROPERTY(QSet<QType *> raisedExceptions READ raisedExceptions) + Q_PROPERTY(QList<QtUml::QParameter *> ownedParameters READ ownedParameters) + Q_PROPERTY(QtUml::QConstraint * bodyCondition READ bodyCondition WRITE setBodyCondition) + Q_PROPERTY(QSet<QtUml::QOperation *> redefinedOperations READ redefinedOperations) + Q_PROPERTY(QSet<QtUml::QConstraint *> postconditions READ postconditions) + Q_PROPERTY(QtUml::QDataType * datatype READ datatype WRITE setDatatype) + Q_PROPERTY(QtUml::QOperationTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QInterface * interface_ READ interface_ WRITE setInterface_) + Q_PROPERTY(QtUml::QType * type READ type STORED false) + Q_PROPERTY(QSet<QtUml::QConstraint *> preconditions READ preconditions) + Q_PROPERTY(QtUml::QClass * class_ READ class_ WRITE setClass_) + Q_PROPERTY(QSet<QtUml::QType *> raisedExceptions READ raisedExceptions) Q_DISABLE_COPY(QOperation) Q_DECLARE_PRIVATE(QOperation) @@ -151,8 +154,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -195,8 +198,8 @@ public: Q_INVOKABLE QSet<QClassifier *> featuringClassifiers() const; // Attributes from aggregated QBehavioralFeature - Q_INVOKABLE QtUml::CallConcurrencyKind concurrency() const; - Q_INVOKABLE void setConcurrency(QtUml::CallConcurrencyKind concurrency); + Q_INVOKABLE QtUmlNS::CallConcurrencyKind concurrency() const; + Q_INVOKABLE void setConcurrency(QtUmlNS::CallConcurrencyKind concurrency); Q_INVOKABLE void unsetConcurrency(); Q_INVOKABLE bool isAbstract() const; Q_INVOKABLE void setAbstract(bool isAbstract); @@ -266,7 +269,9 @@ private: QParameterableElement *_wrappedParameterableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoperation_p.h b/src/uml/qoperation_p.h index 23caedb9..9816c8a9 100644 --- a/src/uml/qoperation_p.h +++ b/src/uml/qoperation_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -91,7 +94,9 @@ public: QSet<QType *> raisedExceptions; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoperationtemplateparameter.cpp b/src/uml/qoperationtemplateparameter.cpp index ffe002ba..99ee71de 100644 --- a/src/uml/qoperationtemplateparameter.cpp +++ b/src/uml/qoperationtemplateparameter.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QOperationTemplateParameterPrivate::QOperationTemplateParameterPrivate() : parameteredElement(0) @@ -116,17 +119,19 @@ void QOperationTemplateParameter::setParameteredElement(QOperation *parameteredE void QOperationTemplateParameter::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operation for this template parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::templateParameter"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The operation for this template parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::templateParameter"); QTemplateParameter::setPropertyData(); } -#include "moc_qoperationtemplateparameter.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qoperationtemplateparameter.cpp" diff --git a/src/uml/qoperationtemplateparameter.h b/src/uml/qoperationtemplateparameter.h index cb3674c2..3e967280 100644 --- a/src/uml/qoperationtemplateparameter.h +++ b/src/uml/qoperationtemplateparameter.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QOperationTemplateParameter : public QTemplateParameter { Q_OBJECT - Q_PROPERTY(QOperation * parameteredElement READ parameteredElement WRITE setParameteredElement) + Q_PROPERTY(QtUml::QOperation * parameteredElement READ parameteredElement WRITE setParameteredElement) Q_DISABLE_COPY(QOperationTemplateParameter) Q_DECLARE_PRIVATE(QOperationTemplateParameter) @@ -80,7 +83,9 @@ protected: explicit QOperationTemplateParameter(QOperationTemplateParameterPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoperationtemplateparameter_p.h b/src/uml/qoperationtemplateparameter_p.h index c34c9b11..580aa0b1 100644 --- a/src/uml/qoperationtemplateparameter_p.h +++ b/src/uml/qoperationtemplateparameter_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOperation *parameteredElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoutputpin.cpp b/src/uml/qoutputpin.cpp index dddb8e88..b454b937 100644 --- a/src/uml/qoutputpin.cpp +++ b/src/uml/qoutputpin.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QOutputPinPrivate::QOutputPinPrivate() { @@ -83,7 +86,9 @@ void QOutputPin::setPropertyData() QPin::setPropertyData(); } -#include "moc_qoutputpin.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qoutputpin.cpp" diff --git a/src/uml/qoutputpin.h b/src/uml/qoutputpin.h index 91100ea3..2d53f658 100644 --- a/src/uml/qoutputpin.h +++ b/src/uml/qoutputpin.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QOutputPin(QOutputPinPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qoutputpin_p.h b/src/uml/qoutputpin_p.h index f27a0cab..2698883d 100644 --- a/src/uml/qoutputpin_p.h +++ b/src/uml/qoutputpin_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QOutputPin; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackage.cpp b/src/uml/qpackage.cpp index 6dda3e69..f5b385ca 100644 --- a/src/uml/qpackage.cpp +++ b/src/uml/qpackage.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPackagePrivate::QPackagePrivate() : nestingPackage(0) @@ -317,19 +320,19 @@ void QPackage::setTemplateParameter(QTemplateParameter *templateParameter) /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QPackage::visibility() const +QtUmlNS::VisibilityKind QPackage::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QPackage::setVisibility(QtUml::VisibilityKind visibility) +void QPackage::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QPackage::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QPackage); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -707,61 +710,61 @@ QSet<QPackageableElement *> QPackage::visibleMembers() const void QPackage::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides an identifier for the package that can be used for many purposes. A URI is the universally unique identification of the package following the IETF URI specification, RFC 2396 http://www.ietf.org/rfc/rfc2396.txt and it must comply with those syntax rules."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Types."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QType::package"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the packageable elements that are owned by this Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that owns this Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestedPackage"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ProfileApplications that indicate which profiles have been applied to the Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProfileApplication::applyingPackage"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Stereotypes that are owned by the Package"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageMerges that are owned by this Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageMerge::receivingPackage"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Packages."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestingPackage"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Provides an identifier for the package that can be used for many purposes. A URI is the universally unique identification of the package following the IETF URI specification, RFC 2396 http://www.ietf.org/rfc/rfc2396.txt and it must comply with those syntax rules."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Types."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedTypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QType::package"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the packageable elements that are owned by this Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packagedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that owns this Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestedPackage"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ProfileApplications that indicate which profiles have been applied to the Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("profileApplications")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProfileApplication::applyingPackage"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Stereotypes that are owned by the Package"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("ownedStereotypes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the PackageMerges that are owned by this Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("packageMerges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackageMerge::receivingPackage"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the packaged elements that are Packages."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QPackage::packagedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackage")][QString::fromLatin1("nestedPackages")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::nestingPackage"); QWrappedObject::setPropertyData(); } @@ -788,7 +791,9 @@ void QPackage::removePackagedElement(QWrappedObjectPointer<QPackage> nestedPacka removeNestedPackage(nestedPackage); } -#include "moc_qpackage.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qpackage.cpp" diff --git a/src/uml/qpackage.h b/src/uml/qpackage.h index 84eb7137..01525c04 100644 --- a/src/uml/qpackage.h +++ b/src/uml/qpackage.h @@ -57,7 +57,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,39 +78,39 @@ class Q_UML_EXPORT QPackage : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QtUml::QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_PROPERTY(QString URI READ URI WRITE setURI) - Q_PROPERTY(QSet<QType *> ownedTypes READ ownedTypes STORED false) - Q_PROPERTY(QSet<QPackageableElement *> packagedElements READ packagedElements) - Q_PROPERTY(QPackage * nestingPackage READ nestingPackage WRITE setNestingPackage) - Q_PROPERTY(QSet<QProfileApplication *> profileApplications READ profileApplications) - Q_PROPERTY(QSet<QStereotype *> ownedStereotypes READ ownedStereotypes STORED false) - Q_PROPERTY(QSet<QPackageMerge *> packageMerges READ packageMerges) - Q_PROPERTY(QSet<QPackage *> nestedPackages READ nestedPackages STORED false) + Q_PROPERTY(QSet<QtUml::QType *> ownedTypes READ ownedTypes STORED false) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> packagedElements READ packagedElements) + Q_PROPERTY(QtUml::QPackage * nestingPackage READ nestingPackage WRITE setNestingPackage) + Q_PROPERTY(QSet<QtUml::QProfileApplication *> profileApplications READ profileApplications) + Q_PROPERTY(QSet<QtUml::QStereotype *> ownedStereotypes READ ownedStereotypes STORED false) + Q_PROPERTY(QSet<QtUml::QPackageMerge *> packageMerges READ packageMerges) + Q_PROPERTY(QSet<QtUml::QPackage *> nestedPackages READ nestedPackages STORED false) Q_DISABLE_COPY(QPackage) Q_DECLARE_PRIVATE(QPackage) @@ -157,8 +160,8 @@ public: Q_INVOKABLE void setTemplateParameter(QTemplateParameter *templateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from aggregated QTemplateableElement @@ -216,7 +219,9 @@ private: QTemplateableElement *_wrappedTemplateableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackage_p.h b/src/uml/qpackage_p.h index 456e377d..ac95007a 100644 --- a/src/uml/qpackage_p.h +++ b/src/uml/qpackage_p.h @@ -55,7 +55,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -83,7 +86,9 @@ public: QSet<QPackageMerge *> packageMerges; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackageableelement.cpp b/src/uml/qpackageableelement.cpp index a5d7a2c6..41f2201d 100644 --- a/src/uml/qpackageableelement.cpp +++ b/src/uml/qpackageableelement.cpp @@ -44,10 +44,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPackageableElementPrivate::QPackageableElementPrivate() : - visibility(QtUml::VisibilityPublic) + visibility(QtUmlNS::VisibilityPublic) { } @@ -226,7 +229,7 @@ void QPackageableElement::removeClientDependency(QDependency *clientDependency) /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QPackageableElement::visibility() const +QtUmlNS::VisibilityKind QPackageableElement::visibility() const { // This is a read-write attribute @@ -234,7 +237,7 @@ QtUml::VisibilityKind QPackageableElement::visibility() const return d->visibility; } -void QPackageableElement::setVisibility(QtUml::VisibilityKind visibility) +void QPackageableElement::setVisibility(QtUmlNS::VisibilityKind visibility) { // This is a read-write attribute @@ -250,24 +253,26 @@ void QPackageableElement::setVisibility(QtUml::VisibilityKind visibility) void QPackageableElement::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QPackageableElement); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } void QPackageableElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates that packageable elements must always have a visibility, i.e., visibility is not optional."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QNamedElement::visibility"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates that packageable elements must always have a visibility, i.e., visibility is not optional."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QNamedElement::visibility"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qpackageableelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qpackageableelement.cpp" diff --git a/src/uml/qpackageableelement.h b/src/uml/qpackageableelement.h index 6fdcf1b4..8c8cbe1e 100644 --- a/src/uml/qpackageableelement.h +++ b/src/uml/qpackageableelement.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,20 +66,20 @@ class Q_UML_EXPORT QPackageableElement : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) Q_DISABLE_COPY(QPackageableElement) Q_DECLARE_PRIVATE(QPackageableElement) @@ -112,8 +115,8 @@ public: Q_INVOKABLE void removeClientDependency(QDependency *clientDependency); // Attributes from QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); virtual void setPropertyData(); @@ -126,7 +129,9 @@ private: QNamedElement *_wrappedNamedElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackageableelement_p.h b/src/uml/qpackageableelement_p.h index 02623ce5..526dd0f6 100644 --- a/src/uml/qpackageableelement_p.h +++ b/src/uml/qpackageableelement_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,10 +68,12 @@ public: explicit QPackageableElementPrivate(); virtual ~QPackageableElementPrivate(); - QtUml::VisibilityKind visibility; + QtUmlNS::VisibilityKind visibility; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackageimport.cpp b/src/uml/qpackageimport.cpp index b0cbec6c..21876306 100644 --- a/src/uml/qpackageimport.cpp +++ b/src/uml/qpackageimport.cpp @@ -47,10 +47,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPackageImportPrivate::QPackageImportPrivate() : - visibility(QtUml::VisibilityPublic), + visibility(QtUmlNS::VisibilityPublic), importingNamespace(0), importedPackage(0) { @@ -91,7 +94,7 @@ QPackageImport::~QPackageImport() /*! Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not. */ -QtUml::VisibilityKind QPackageImport::visibility() const +QtUmlNS::VisibilityKind QPackageImport::visibility() const { // This is a read-write attribute @@ -99,7 +102,7 @@ QtUml::VisibilityKind QPackageImport::visibility() const return d->visibility; } -void QPackageImport::setVisibility(QtUml::VisibilityKind visibility) +void QPackageImport::setVisibility(QtUmlNS::VisibilityKind visibility) { // This is a read-write attribute @@ -112,7 +115,7 @@ void QPackageImport::setVisibility(QtUml::VisibilityKind visibility) void QPackageImport::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QPackageImport); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -190,31 +193,33 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage) void QPackageImport::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports the members from a Package."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::packageImport"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Package whose members are imported into a Namespace."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the visibility of the imported PackageableElements within the importing Namespace, i.e., whether imported elements will in turn be visible to other packages that use that importingPackage as an importedPackage. If the PackageImport is public, the imported elements will be visible outside the package, while if it is private they will not."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Namespace that imports the members from a Package."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importingNamespace")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QNamespace::packageImport"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the Package whose members are imported into a Namespace."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageImport")][QString::fromLatin1("importedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDirectedRelationship::setPropertyData(); } -#include "moc_qpackageimport.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qpackageimport.cpp" diff --git a/src/uml/qpackageimport.h b/src/uml/qpackageimport.h index d18839be..e7c67766 100644 --- a/src/uml/qpackageimport.h +++ b/src/uml/qpackageimport.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,9 +68,9 @@ class Q_UML_EXPORT QPackageImport : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) - Q_PROPERTY(QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) - Q_PROPERTY(QPackage * importedPackage READ importedPackage WRITE setImportedPackage) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUml::QNamespace * importingNamespace READ importingNamespace WRITE setImportingNamespace) + Q_PROPERTY(QtUml::QPackage * importedPackage READ importedPackage WRITE setImportedPackage) Q_DISABLE_COPY(QPackageImport) Q_DECLARE_PRIVATE(QPackageImport) @@ -77,8 +80,8 @@ public: virtual ~QPackageImport(); // Attributes from QPackageImport - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Association ends from QPackageImport @@ -93,7 +96,9 @@ protected: explicit QPackageImport(QPackageImportPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackageimport_p.h b/src/uml/qpackageimport_p.h index 7251baa4..7643640d 100644 --- a/src/uml/qpackageimport_p.h +++ b/src/uml/qpackageimport_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,12 +71,14 @@ public: explicit QPackageImportPrivate(); virtual ~QPackageImportPrivate(); - QtUml::VisibilityKind visibility; + QtUmlNS::VisibilityKind visibility; QNamespace *importingNamespace; QPackage *importedPackage; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackagemerge.cpp b/src/uml/qpackagemerge.cpp index 481e047a..da540448 100644 --- a/src/uml/qpackagemerge.cpp +++ b/src/uml/qpackagemerge.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPackageMergePrivate::QPackageMergePrivate() : mergedPackage(0), @@ -155,24 +158,26 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage) void QPackageMerge::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is to be merged with the receiving package of the PackageMerge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is being extended with the contents of the merged package of the PackageMerge."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::packageMerge"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is to be merged with the receiving package of the PackageMerge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Package that is being extended with the contents of the merged package of the PackageMerge."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPackageMerge")][QString::fromLatin1("receivingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::packageMerge"); QDirectedRelationship::setPropertyData(); } -#include "moc_qpackagemerge.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qpackagemerge.cpp" diff --git a/src/uml/qpackagemerge.h b/src/uml/qpackagemerge.h index aadc3e97..2a552b68 100644 --- a/src/uml/qpackagemerge.h +++ b/src/uml/qpackagemerge.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QPackageMerge : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(QPackage * mergedPackage READ mergedPackage WRITE setMergedPackage) - Q_PROPERTY(QPackage * receivingPackage READ receivingPackage WRITE setReceivingPackage) + Q_PROPERTY(QtUml::QPackage * mergedPackage READ mergedPackage WRITE setMergedPackage) + Q_PROPERTY(QtUml::QPackage * receivingPackage READ receivingPackage WRITE setReceivingPackage) Q_DISABLE_COPY(QPackageMerge) Q_DECLARE_PRIVATE(QPackageMerge) @@ -83,7 +86,9 @@ protected: explicit QPackageMerge(QPackageMergePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpackagemerge_p.h b/src/uml/qpackagemerge_p.h index 9534e9ea..c9df5aa8 100644 --- a/src/uml/qpackagemerge_p.h +++ b/src/uml/qpackagemerge_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QPackage *receivingPackage; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qparameter.cpp b/src/uml/qparameter.cpp index feb3396d..f0d09c1f 100644 --- a/src/uml/qparameter.cpp +++ b/src/uml/qparameter.cpp @@ -48,11 +48,14 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QParameterPrivate::QParameterPrivate() : isException(false), - direction(QtUml::ParameterDirectionIn), + direction(QtUmlNS::ParameterDirectionIn), isStream(false), operation(0), defaultValue(0) @@ -256,12 +259,12 @@ void QParameter::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QParameter::visibility() const +QtUmlNS::VisibilityKind QParameter::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QParameter::setVisibility(QtUml::VisibilityKind visibility) +void QParameter::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -436,7 +439,7 @@ void QParameter::setDefault_(QString default_) /*! Indicates whether a parameter is being sent into or out of a behavioral element. */ -QtUml::ParameterDirectionKind QParameter::direction() const +QtUmlNS::ParameterDirectionKind QParameter::direction() const { // This is a read-write attribute @@ -444,7 +447,7 @@ QtUml::ParameterDirectionKind QParameter::direction() const return d->direction; } -void QParameter::setDirection(QtUml::ParameterDirectionKind direction) +void QParameter::setDirection(QtUmlNS::ParameterDirectionKind direction) { // This is a read-write attribute @@ -457,7 +460,7 @@ void QParameter::setDirection(QtUml::ParameterDirectionKind direction) void QParameter::unsetDirection() { - setDirection(QtUml::ParameterDirectionIn); + setDirection(QtUmlNS::ParameterDirectionIn); Q_D(QParameter); d->modifiedResettableProperties.removeAll(QString::fromLatin1("direction")); } @@ -494,7 +497,7 @@ void QParameter::unsetStream() /*! Specifies the effect that the owner of the parameter has on values passed in or out of the parameter. */ -QtUml::ParameterEffectKind QParameter::effect() const +QtUmlNS::ParameterEffectKind QParameter::effect() const { // This is a read-write attribute @@ -502,7 +505,7 @@ QtUml::ParameterEffectKind QParameter::effect() const return d->effect; } -void QParameter::setEffect(QtUml::ParameterEffectKind effect) +void QParameter::setEffect(QtUmlNS::ParameterEffectKind effect) { // This is a read-write attribute @@ -617,66 +620,68 @@ void QParameter::removeParameterSet(QParameterSet *parameterSet) void QParameter::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether an output parameter may emit a value to the exclusion of the other outputs."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a String that represents a value to be used when no argument is supplied for the Parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether a parameter is being sent into or out of a behavioral element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether an input parameter may accept values while its behavior is executing, or whether an output parameter post values while the behavior is executing."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the effect that the owner of the parameter has on values passed in or out of the parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operation owning this parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::ownedParameter"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a ValueSpecification that represents a value to be used when no argument is supplied for the Parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameter sets containing the parameter. See ParameterSet."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameterSet::parameter"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether an output parameter may emit a value to the exclusion of the other outputs."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a String that represents a value to be used when no argument is supplied for the Parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether a parameter is being sent into or out of a behavioral element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("direction")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether an input parameter may accept values while its behavior is executing, or whether an output parameter post values while the behavior is executing."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("isStream")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the effect that the owner of the parameter has on values passed in or out of the parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("effect")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Operation owning this parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("operation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QOperation::ownedParameter"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a ValueSpecification that represents a value to be used when no argument is supplied for the Parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameter sets containing the parameter. See ParameterSet."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameter")][QString::fromLatin1("parameterSets")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameterSet::parameter"); QWrappedObject::setPropertyData(); } -#include "moc_qparameter.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qparameter.cpp" diff --git a/src/uml/qparameter.h b/src/uml/qparameter.h index 25b76061..b8cb0335 100644 --- a/src/uml/qparameter.h +++ b/src/uml/qparameter.h @@ -58,7 +58,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,39 +76,39 @@ class Q_UML_EXPORT QParameter : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtUml::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtUml::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QList<QConnectorEnd *> ends READ ends STORED false) - Q_PROPERTY(QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QList<QtUml::QConnectorEnd *> ends READ ends STORED false) + Q_PROPERTY(QtUml::QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) Q_PROPERTY(bool isException READ isException WRITE setException RESET unsetException) Q_PROPERTY(QString default_ READ default_ WRITE setDefault_ STORED false) - Q_PROPERTY(QtUml::ParameterDirectionKind direction READ direction WRITE setDirection RESET unsetDirection) + Q_PROPERTY(QtUmlNS::ParameterDirectionKind direction READ direction WRITE setDirection RESET unsetDirection) Q_PROPERTY(bool isStream READ isStream WRITE setStream RESET unsetStream) - Q_PROPERTY(QtUml::ParameterEffectKind effect READ effect WRITE setEffect) - Q_PROPERTY(QOperation * operation READ operation WRITE setOperation) - Q_PROPERTY(QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) - Q_PROPERTY(QSet<QParameterSet *> parameterSets READ parameterSets) + Q_PROPERTY(QtUmlNS::ParameterEffectKind effect READ effect WRITE setEffect) + Q_PROPERTY(QtUml::QOperation * operation READ operation WRITE setOperation) + Q_PROPERTY(QtUml::QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) + Q_PROPERTY(QSet<QtUml::QParameterSet *> parameterSets READ parameterSets) Q_DISABLE_COPY(QParameter) Q_DECLARE_PRIVATE(QParameter) @@ -143,8 +146,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -174,14 +177,14 @@ public: Q_INVOKABLE void unsetException(); Q_INVOKABLE QString default_() const; Q_INVOKABLE void setDefault_(QString default_); - Q_INVOKABLE QtUml::ParameterDirectionKind direction() const; - Q_INVOKABLE void setDirection(QtUml::ParameterDirectionKind direction); + Q_INVOKABLE QtUmlNS::ParameterDirectionKind direction() const; + Q_INVOKABLE void setDirection(QtUmlNS::ParameterDirectionKind direction); Q_INVOKABLE void unsetDirection(); Q_INVOKABLE bool isStream() const; Q_INVOKABLE void setStream(bool isStream); Q_INVOKABLE void unsetStream(); - Q_INVOKABLE QtUml::ParameterEffectKind effect() const; - Q_INVOKABLE void setEffect(QtUml::ParameterEffectKind effect); + Q_INVOKABLE QtUmlNS::ParameterEffectKind effect() const; + Q_INVOKABLE void setEffect(QtUmlNS::ParameterEffectKind effect); // Association ends from QParameter Q_INVOKABLE QOperation *operation() const; @@ -202,7 +205,9 @@ private: QConnectableElement *_wrappedConnectableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qparameter_p.h b/src/uml/qparameter_p.h index 8c7e3593..6f787099 100644 --- a/src/uml/qparameter_p.h +++ b/src/uml/qparameter_p.h @@ -58,7 +58,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,15 +80,17 @@ public: virtual ~QParameterPrivate(); bool isException; - QtUml::ParameterDirectionKind direction; + QtUmlNS::ParameterDirectionKind direction; bool isStream; - QtUml::ParameterEffectKind effect; + QtUmlNS::ParameterEffectKind effect; QOperation *operation; QValueSpecification *defaultValue; QSet<QParameterSet *> parameterSets; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qparameterableelement.cpp b/src/uml/qparameterableelement.cpp index a8344b89..2c0b7c5c 100644 --- a/src/uml/qparameterableelement.cpp +++ b/src/uml/qparameterableelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QParameterableElementPrivate::QParameterableElementPrivate() : owningTemplateParameter(0), @@ -165,24 +168,26 @@ bool QParameterableElement::isTemplateParameter() const void QParameterableElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameter that owns this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameter::ownedParameteredElement"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template parameter that exposes this element as a formal parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameter that owns this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QParameterableElement::templateParameter QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameter::ownedParameteredElement"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template parameter that exposes this element as a formal parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterableElement")][QString::fromLatin1("templateParameter")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameter::parameteredElement"); QElement::setPropertyData(); } -#include "moc_qparameterableelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qparameterableelement.cpp" diff --git a/src/uml/qparameterableelement.h b/src/uml/qparameterableelement.h index 9a258131..bff51c3f 100644 --- a/src/uml/qparameterableelement.h +++ b/src/uml/qparameterableelement.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QParameterableElement : public QElement { Q_OBJECT - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) Q_DISABLE_COPY(QParameterableElement) Q_DECLARE_PRIVATE(QParameterableElement) @@ -87,7 +90,9 @@ protected: explicit QParameterableElement(QParameterableElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qparameterableelement_p.h b/src/uml/qparameterableelement_p.h index 8cfb5c67..627c366d 100644 --- a/src/uml/qparameterableelement_p.h +++ b/src/uml/qparameterableelement_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QTemplateParameter *templateParameter; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qparameterset.cpp b/src/uml/qparameterset.cpp index 4d153cb0..a19e9e6f 100644 --- a/src/uml/qparameterset.cpp +++ b/src/uml/qparameterset.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QParameterSetPrivate::QParameterSetPrivate() { @@ -162,24 +165,26 @@ void QParameterSet::removeCondition(QConstraint *condition) void QParameterSet::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Parameters in the parameter set."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameter::parameterSet"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint that should be satisfied for the owner of the parameters in an input parameter set to start execution using the values provided for those parameters, or the owner of the parameters in an output parameter set to end execution providing the values for those parameters, if all preconditions and conditions on input parameter sets were satisfied."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Parameters in the parameter set."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameter::parameterSet"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Constraint that should be satisfied for the owner of the parameters in an input parameter set to start execution using the values provided for those parameters, or the owner of the parameters in an output parameter set to end execution providing the values for those parameters, if all preconditions and conditions on input parameter sets were satisfied."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QParameterSet")][QString::fromLatin1("conditions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qparameterset.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qparameterset.cpp" diff --git a/src/uml/qparameterset.h b/src/uml/qparameterset.h index 7cd2c1f7..c863109c 100644 --- a/src/uml/qparameterset.h +++ b/src/uml/qparameterset.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QParameterSet : public QNamedElement { Q_OBJECT - Q_PROPERTY(QSet<QParameter *> parameters READ parameters) - Q_PROPERTY(QSet<QConstraint *> conditions READ conditions) + Q_PROPERTY(QSet<QtUml::QParameter *> parameters READ parameters) + Q_PROPERTY(QSet<QtUml::QConstraint *> conditions READ conditions) Q_DISABLE_COPY(QParameterSet) Q_DECLARE_PRIVATE(QParameterSet) @@ -89,7 +92,9 @@ protected: explicit QParameterSet(QParameterSetPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qparameterset_p.h b/src/uml/qparameterset_p.h index 3c211b66..7874cd0f 100644 --- a/src/uml/qparameterset_p.h +++ b/src/uml/qparameterset_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QConstraint *> conditions; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpartdecomposition.cpp b/src/uml/qpartdecomposition.cpp index 80c1e2a0..0fc41c4e 100644 --- a/src/uml/qpartdecomposition.cpp +++ b/src/uml/qpartdecomposition.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPartDecompositionPrivate::QPartDecompositionPrivate() { @@ -83,7 +86,9 @@ void QPartDecomposition::setPropertyData() QInteractionUse::setPropertyData(); } -#include "moc_qpartdecomposition.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qpartdecomposition.cpp" diff --git a/src/uml/qpartdecomposition.h b/src/uml/qpartdecomposition.h index 44d26208..5bd3dd7c 100644 --- a/src/uml/qpartdecomposition.h +++ b/src/uml/qpartdecomposition.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QPartDecomposition(QPartDecompositionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpartdecomposition_p.h b/src/uml/qpartdecomposition_p.h index 091d3caf..3d56ad6f 100644 --- a/src/uml/qpartdecomposition_p.h +++ b/src/uml/qpartdecomposition_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QPartDecomposition; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpin.cpp b/src/uml/qpin.cpp index b198d80c..c44c5527 100644 --- a/src/uml/qpin.cpp +++ b/src/uml/qpin.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPinPrivate::QPinPrivate() : isControl(false) @@ -248,12 +251,12 @@ void QPin::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QPin::visibility() const +QtUmlNS::VisibilityKind QPin::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QPin::setVisibility(QtUml::VisibilityKind visibility) +void QPin::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -525,19 +528,19 @@ void QPin::unsetControlType() /*! Tells whether and how the tokens in the object node are ordered for selection to traverse edges outgoing from the object node. */ -QtUml::ObjectNodeOrderingKind QPin::ordering() const +QtUmlNS::ObjectNodeOrderingKind QPin::ordering() const { return (qwrappedobject_cast<const QObjectNode *>(this))->ordering(); } -void QPin::setOrdering(QtUml::ObjectNodeOrderingKind ordering) +void QPin::setOrdering(QtUmlNS::ObjectNodeOrderingKind ordering) { (qwrappedobject_cast<QObjectNode *>(this))->setOrdering(ordering); } void QPin::unsetOrdering() { - setOrdering(QtUml::ObjectNodeOrderingFIFO); + setOrdering(QtUmlNS::ObjectNodeOrderingFIFO); Q_D(QPin); d->modifiedResettableProperties.removeAll(QString::fromLatin1("ordering")); } @@ -625,17 +628,19 @@ void QPin::unsetControl() void QPin::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the pins provide data to the actions, or just controls when it executes it."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the pins provide data to the actions, or just controls when it executes it."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qpin.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qpin.cpp" diff --git a/src/uml/qpin.h b/src/uml/qpin.h index 02d5d77b..9a2b0b52 100644 --- a/src/uml/qpin.h +++ b/src/uml/qpin.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -60,44 +63,44 @@ class Q_UML_EXPORT QPin : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtUml::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtUml::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QActivityNode *> redefinedNodes READ redefinedNodes) - Q_PROPERTY(QSet<QActivityEdge *> incomings READ incomings) - Q_PROPERTY(QActivity * activity READ activity WRITE setActivity) - Q_PROPERTY(QSet<QActivityGroup *> inGroup READ inGroup) - Q_PROPERTY(QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) - Q_PROPERTY(QSet<QActivityPartition *> inPartition READ inPartition) - Q_PROPERTY(QSet<QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) - Q_PROPERTY(QSet<QActivityEdge *> outgoings READ outgoings) + Q_PROPERTY(QSet<QtUml::QActivityNode *> redefinedNodes READ redefinedNodes) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> incomings READ incomings) + Q_PROPERTY(QtUml::QActivity * activity READ activity WRITE setActivity) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> inGroup READ inGroup) + Q_PROPERTY(QtUml::QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) + Q_PROPERTY(QSet<QtUml::QActivityPartition *> inPartition READ inPartition) + Q_PROPERTY(QSet<QtUml::QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> outgoings READ outgoings) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) Q_PROPERTY(bool isControlType READ isControlType WRITE setControlType RESET unsetControlType) - Q_PROPERTY(QtUml::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering) - Q_PROPERTY(QValueSpecification * upperBound READ upperBound WRITE setUpperBound) - Q_PROPERTY(QBehavior * selection READ selection WRITE setSelection) - Q_PROPERTY(QSet<QState *> inState READ inState) + Q_PROPERTY(QtUmlNS::ObjectNodeOrderingKind ordering READ ordering WRITE setOrdering RESET unsetOrdering) + Q_PROPERTY(QtUml::QValueSpecification * upperBound READ upperBound WRITE setUpperBound) + Q_PROPERTY(QtUml::QBehavior * selection READ selection WRITE setSelection) + Q_PROPERTY(QSet<QtUml::QState *> inState READ inState) Q_PROPERTY(bool isControl READ isControl WRITE setControl RESET unsetControl) @@ -137,8 +140,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -188,8 +191,8 @@ public: Q_INVOKABLE bool isControlType() const; Q_INVOKABLE void setControlType(bool isControlType); Q_INVOKABLE void unsetControlType(); - Q_INVOKABLE QtUml::ObjectNodeOrderingKind ordering() const; - Q_INVOKABLE void setOrdering(QtUml::ObjectNodeOrderingKind ordering); + Q_INVOKABLE QtUmlNS::ObjectNodeOrderingKind ordering() const; + Q_INVOKABLE void setOrdering(QtUmlNS::ObjectNodeOrderingKind ordering); Q_INVOKABLE void unsetOrdering(); // Association ends from aggregated QObjectNode @@ -216,7 +219,9 @@ private: QObjectNode *_wrappedObjectNode; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpin_p.h b/src/uml/qpin_p.h index e67d7ea5..966067fc 100644 --- a/src/uml/qpin_p.h +++ b/src/uml/qpin_p.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,7 +68,9 @@ public: bool isControl; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qport.cpp b/src/uml/qport.cpp index 27e9d16e..47d2c115 100644 --- a/src/uml/qport.cpp +++ b/src/uml/qport.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPortPrivate::QPortPrivate() : isConjugated(false), @@ -264,54 +267,54 @@ void QPort::removeRedefinedPort(QPort *redefinedPort) void QPort::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the way that the provided and required interfaces are derived from the Port’s Type. The default value is false."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether requests arriving at this port are sent to the classifier behavior of this classifier. Such ports are referred to as behavior port. Any invocation of a behavioral feature targeted at a behavior port will be handled by the instance of the owning classifier itself, rather than by any instances that this classifier may contain."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isService")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isService")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isService")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true indicates that this port is used to provide the published functionality of a classifier; if false, this port is used to implement the classifier but is not part of the essential externally-visible functionality of the classifier and can, therefore, be altered or deleted along with the internal implementation of the classifier and other properties that are considered part of its implementation."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isService")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isService")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isService")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References an optional protocol state machine which describes valid interactions at this interaction point."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("required")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("required")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("required")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the interfaces specifying the set of operations and receptions that the classifier expects its environment to handle via this port. This association is derived according to the value of isConjugated. If isConjugated is false, required is derived as the union of the sets of interfaces used by the type of the port and its supertypes. If isConjugated is true, it is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("required")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("required")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("required")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("provided")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("provided")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("provided")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the interfaces specifying the set of operations and receptions that the classifier offers to its environment via this port, and which it will handle either directly or by forwarding it to a part of its internal structure. This association is derived according to the value of isConjugated. If isConjugated is false, provided is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface. If isConjugated is true, it is derived as the union of the sets of interfaces used by the type of the port and its supertypes."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("provided")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("provided")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("provided")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A port may be redefined when its containing classifier is specialized. The redefining port may have additional interfaces to those that are associated with the redefined port or it may replace an interface by one of its subtypes."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QProperty::redefinedProperties"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the way that the provided and required interfaces are derived from the Port’s Type. The default value is false."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether requests arriving at this port are sent to the classifier behavior of this classifier. Such ports are referred to as behavior port. Any invocation of a behavioral feature targeted at a behavior port will be handled by the instance of the owning classifier itself, rather than by any instances that this classifier may contain."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isBehavior")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isService")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isService")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isService")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true indicates that this port is used to provide the published functionality of a classifier; if false, this port is used to implement the classifier but is not part of the essential externally-visible functionality of the classifier and can, therefore, be altered or deleted along with the internal implementation of the classifier and other properties that are considered part of its implementation."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isService")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isService")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("isService")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References an optional protocol state machine which describes valid interactions at this interaction point."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("protocol")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("required")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("required")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("required")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the interfaces specifying the set of operations and receptions that the classifier expects its environment to handle via this port. This association is derived according to the value of isConjugated. If isConjugated is false, required is derived as the union of the sets of interfaces used by the type of the port and its supertypes. If isConjugated is true, it is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("required")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("required")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("required")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("provided")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("provided")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("provided")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the interfaces specifying the set of operations and receptions that the classifier offers to its environment via this port, and which it will handle either directly or by forwarding it to a part of its internal structure. This association is derived according to the value of isConjugated. If isConjugated is false, provided is derived as the union of the sets of interfaces realized by the type of the port and its supertypes, or directly from the type of the port if the port is typed by an interface. If isConjugated is true, it is derived as the union of the sets of interfaces used by the type of the port and its supertypes."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("provided")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("provided")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("provided")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A port may be redefined when its containing classifier is specialized. The redefining port may have additional interfaces to those that are associated with the redefined port or it may replace an interface by one of its subtypes."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QProperty::redefinedProperties"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPort")][QString::fromLatin1("redefinedPorts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QProperty::setPropertyData(); } @@ -328,7 +331,9 @@ void QPort::removeRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort) removeRedefinedPort(redefinedPort); } -#include "moc_qport.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qport.cpp" diff --git a/src/uml/qport.h b/src/uml/qport.h index 66f3082b..94557ea6 100644 --- a/src/uml/qport.h +++ b/src/uml/qport.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,10 +73,10 @@ class Q_UML_EXPORT QPort : public QProperty Q_PROPERTY(bool isConjugated READ isConjugated WRITE setConjugated RESET unsetConjugated) Q_PROPERTY(bool isBehavior READ isBehavior WRITE setBehavior RESET unsetBehavior) Q_PROPERTY(bool isService READ isService WRITE setService RESET unsetService) - Q_PROPERTY(QProtocolStateMachine * protocol READ protocol WRITE setProtocol) - Q_PROPERTY(QSet<QInterface *> required READ required STORED false) - Q_PROPERTY(QSet<QInterface *> provided READ provided STORED false) - Q_PROPERTY(QSet<QPort *> redefinedPorts READ redefinedPorts) + Q_PROPERTY(QtUml::QProtocolStateMachine * protocol READ protocol WRITE setProtocol) + Q_PROPERTY(QSet<QtUml::QInterface *> required READ required STORED false) + Q_PROPERTY(QSet<QtUml::QInterface *> provided READ provided STORED false) + Q_PROPERTY(QSet<QtUml::QPort *> redefinedPorts READ redefinedPorts) Q_DISABLE_COPY(QPort) Q_DECLARE_PRIVATE(QPort) @@ -112,7 +115,9 @@ protected: explicit QPort(QPortPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qport_p.h b/src/uml/qport_p.h index f004d6fb..f3127761 100644 --- a/src/uml/qport_p.h +++ b/src/uml/qport_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,7 +78,9 @@ public: QSet<QPort *> redefinedPorts; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprimitivetype.cpp b/src/uml/qprimitivetype.cpp index cb4f19f3..4363e50a 100644 --- a/src/uml/qprimitivetype.cpp +++ b/src/uml/qprimitivetype.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPrimitiveTypePrivate::QPrimitiveTypePrivate() { @@ -83,7 +86,9 @@ void QPrimitiveType::setPropertyData() QDataType::setPropertyData(); } -#include "moc_qprimitivetype.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qprimitivetype.cpp" diff --git a/src/uml/qprimitivetype.h b/src/uml/qprimitivetype.h index b26b8508..b48a0491 100644 --- a/src/uml/qprimitivetype.h +++ b/src/uml/qprimitivetype.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QPrimitiveType(QPrimitiveTypePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprimitivetype_p.h b/src/uml/qprimitivetype_p.h index e94e5d54..794427e4 100644 --- a/src/uml/qprimitivetype_p.h +++ b/src/uml/qprimitivetype_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QPrimitiveType; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprofile.cpp b/src/uml/qprofile.cpp index 35069009..47a4546f 100644 --- a/src/uml/qprofile.cpp +++ b/src/uml/qprofile.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QProfilePrivate::QProfilePrivate() { @@ -161,24 +164,26 @@ void QProfile::removeMetaclassReference(QElementImport *metaclassReference) void QProfile::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a package containing (directly or indirectly) metaclasses that may be extended."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::packageImports"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a metaclass that may be extended."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::elementImports"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a package containing (directly or indirectly) metaclasses that may be extended."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::packageImports"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References a metaclass that may be extended."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::elementImports"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfile")][QString::fromLatin1("metaclassReferences")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QPackage::setPropertyData(); } -#include "moc_qprofile.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qprofile.cpp" diff --git a/src/uml/qprofile.h b/src/uml/qprofile.h index f9fff573..c3000d73 100644 --- a/src/uml/qprofile.h +++ b/src/uml/qprofile.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QProfile : public QPackage { Q_OBJECT - Q_PROPERTY(QSet<QPackageImport *> metamodelReferences READ metamodelReferences) - Q_PROPERTY(QSet<QElementImport *> metaclassReferences READ metaclassReferences) + Q_PROPERTY(QSet<QtUml::QPackageImport *> metamodelReferences READ metamodelReferences) + Q_PROPERTY(QSet<QtUml::QElementImport *> metaclassReferences READ metaclassReferences) Q_DISABLE_COPY(QProfile) Q_DECLARE_PRIVATE(QProfile) @@ -89,7 +92,9 @@ protected: explicit QProfile(QProfilePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprofile_p.h b/src/uml/qprofile_p.h index 5cd01137..56fdf5ee 100644 --- a/src/uml/qprofile_p.h +++ b/src/uml/qprofile_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QElementImport *> metaclassReferences; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprofileapplication.cpp b/src/uml/qprofileapplication.cpp index dce39a25..dfca5677 100644 --- a/src/uml/qprofileapplication.cpp +++ b/src/uml/qprofileapplication.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QProfileApplicationPrivate::QProfileApplicationPrivate() : isStrict(false), @@ -190,31 +193,33 @@ void QProfileApplication::setAppliedProfile(QProfile *appliedProfile) void QProfileApplication::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies that the Profile filtering rules for the metaclasses of the referenced metamodel shall be strictly applied."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The package that owns the profile application."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::profileApplication"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Profiles that are applied to a Package through this ProfileApplication."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies that the Profile filtering rules for the metaclasses of the referenced metamodel shall be strictly applied."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The package that owns the profile application."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("applyingPackage")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::profileApplication"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Profiles that are applied to a Package through this ProfileApplication."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProfileApplication")][QString::fromLatin1("appliedProfile")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDirectedRelationship::setPropertyData(); } -#include "moc_qprofileapplication.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qprofileapplication.cpp" diff --git a/src/uml/qprofileapplication.h b/src/uml/qprofileapplication.h index 5605f0c0..7f72ccff 100644 --- a/src/uml/qprofileapplication.h +++ b/src/uml/qprofileapplication.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,8 +66,8 @@ class Q_UML_EXPORT QProfileApplication : public QDirectedRelationship Q_OBJECT Q_PROPERTY(bool isStrict READ isStrict WRITE setStrict RESET unsetStrict) - Q_PROPERTY(QPackage * applyingPackage READ applyingPackage WRITE setApplyingPackage) - Q_PROPERTY(QProfile * appliedProfile READ appliedProfile WRITE setAppliedProfile) + Q_PROPERTY(QtUml::QPackage * applyingPackage READ applyingPackage WRITE setApplyingPackage) + Q_PROPERTY(QtUml::QProfile * appliedProfile READ appliedProfile WRITE setAppliedProfile) Q_DISABLE_COPY(QProfileApplication) Q_DECLARE_PRIVATE(QProfileApplication) @@ -90,7 +93,9 @@ protected: explicit QProfileApplication(QProfileApplicationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprofileapplication_p.h b/src/uml/qprofileapplication_p.h index 3cc51332..27b78439 100644 --- a/src/uml/qprofileapplication_p.h +++ b/src/uml/qprofileapplication_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QProfile *appliedProfile; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qproperty.cpp b/src/uml/qproperty.cpp index 52055d32..9e47777f 100644 --- a/src/uml/qproperty.cpp +++ b/src/uml/qproperty.cpp @@ -53,14 +53,17 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPropertyPrivate::QPropertyPrivate() : isDerived(false), isReadOnly(false), isID(false), isDerivedUnion(false), - aggregation(QtUml::AggregationNone), + aggregation(QtUmlNS::AggregationNone), owningAssociation(0), defaultValue(0), class_(0), @@ -163,12 +166,12 @@ void QProperty::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QProperty::visibility() const +QtUmlNS::VisibilityKind QProperty::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QProperty::setVisibility(QtUml::VisibilityKind visibility) +void QProperty::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -681,7 +684,7 @@ void QProperty::unsetDerivedUnion() /*! Specifies the kind of aggregation that applies to the Property. */ -QtUml::AggregationKind QProperty::aggregation() const +QtUmlNS::AggregationKind QProperty::aggregation() const { // This is a read-write attribute @@ -689,7 +692,7 @@ QtUml::AggregationKind QProperty::aggregation() const return d->aggregation; } -void QProperty::setAggregation(QtUml::AggregationKind aggregation) +void QProperty::setAggregation(QtUmlNS::AggregationKind aggregation) { // This is a read-write attribute @@ -702,7 +705,7 @@ void QProperty::setAggregation(QtUml::AggregationKind aggregation) void QProperty::unsetAggregation() { - setAggregation(QtUml::AggregationNone); + setAggregation(QtUmlNS::AggregationNone); Q_D(QProperty); d->modifiedResettableProperties.removeAll(QString::fromLatin1("aggregation")); } @@ -1160,136 +1163,138 @@ QSet<QType *> QProperty::subsettingContext() const void QProperty::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If isDerived is true, the value of the attribute is derived from information elsewhere.Specifies whether the Property is derived, i.e., whether its value or values can be computed from other information."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a String that represents a value to be used when no argument is supplied for the Property.A String that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If isComposite is true, the object containing the attribute is a container for the object or value contained in the attribute.This is a derived value, indicating whether the aggregation of the Property is composite or not."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the attribute may only be read, and not written.If isReadOnly is true, the attribute may not be written to after initialization."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuralFeature::isReadOnly"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("True indicates this property can be used to uniquely identify an instance of the containing Class."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the property is derived as the union of all of the properties that are constrained to subset it."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the kind of aggregation that applies to the Property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties of which this property is constrained to be a subset."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the owning association of this property, if any."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace QProperty::association"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::ownedEnd"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional list of ordered qualifier attributes for the end. If the list is empty, then the Association is not qualified."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::associationEnd"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A ValueSpecification that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Class that owns the Property.References the Class that owns the Property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedAttribute"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("In the case where the property is one navigable end of a binary association with both ends navigable, this gives the other end."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the optional association end that owns a qualifier attribute."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::qualifier"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedAttribute"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties that are redefined by this property."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the association of which this property is a member, if any."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::memberEnd"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interface that owns the Property"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterface::ownedAttribute"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If isDerived is true, the value of the attribute is derived from information elsewhere.Specifies whether the Property is derived, i.e., whether its value or values can be computed from other information."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies a String that represents a value to be used when no argument is supplied for the Property.A String that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If isComposite is true, the object containing the attribute is a container for the object or value contained in the attribute.This is a derived value, indicating whether the aggregation of the Property is composite or not."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isComposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, the attribute may only be read, and not written.If isReadOnly is true, the attribute may not be written to after initialization."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuralFeature::isReadOnly"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("True indicates this property can be used to uniquely identify an instance of the containing Class."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isID")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether the property is derived as the union of all of the properties that are constrained to subset it."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("isDerivedUnion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the kind of aggregation that applies to the Property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("aggregation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties of which this property is constrained to be a subset."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("subsettedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the owning association of this property, if any."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts QNamedElement::namespace QProperty::association"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("owningAssociation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::ownedEnd"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional list of ordered qualifier attributes for the end. If the list is empty, then the Association is not qualified."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("qualifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::associationEnd"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A ValueSpecification that is evaluated to give a default value for the Property when an object of the owning Classifier is instantiated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("defaultValue")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Class that owns the Property.References the Class that owns the Property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("class_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClass::ownedAttribute"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("In the case where the property is one navigable end of a binary association with both ends navigable, this gives the other end."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("opposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the optional association end that owns a qualifier attribute."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("associationEnd")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProperty::qualifier"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The DataType that owns this Property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("datatype")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QDataType::ownedAttribute"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties that are redefined by this property."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("redefinedProperties")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the association of which this property is a member, if any."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("association")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QAssociation::memberEnd"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Interface that owns the Property"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace QFeature::featuringClassifiers QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProperty")][QString::fromLatin1("interface_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInterface::ownedAttribute"); QWrappedObject::setPropertyData(); } -#include "moc_qproperty.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qproperty.cpp" diff --git a/src/uml/qproperty.h b/src/uml/qproperty.h index 3b746941..b339e86c 100644 --- a/src/uml/qproperty.h +++ b/src/uml/qproperty.h @@ -59,7 +59,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -79,40 +82,40 @@ class Q_UML_EXPORT QProperty : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtUml::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtUml::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtUml::QClassifier *> featuringClassifiers READ featuringClassifiers) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QList<QConnectorEnd *> ends READ ends STORED false) - Q_PROPERTY(QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QList<QtUml::QConnectorEnd *> ends READ ends STORED false) + Q_PROPERTY(QtUml::QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QSet<QPackageableElement *> deployedElements READ deployedElements STORED false) - Q_PROPERTY(QSet<QDeployment *> deployments READ deployments) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> deployedElements READ deployedElements STORED false) + Q_PROPERTY(QSet<QtUml::QDeployment *> deployments READ deployments) Q_PROPERTY(bool isDerived READ isDerived WRITE setDerived RESET unsetDerived) Q_PROPERTY(QString default_ READ default_ WRITE setDefault_ STORED false) @@ -120,18 +123,18 @@ class Q_UML_EXPORT QProperty : public QWrappedObject Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) Q_PROPERTY(bool isID READ isID WRITE setID RESET unsetID) Q_PROPERTY(bool isDerivedUnion READ isDerivedUnion WRITE setDerivedUnion RESET unsetDerivedUnion) - Q_PROPERTY(QtUml::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation) - Q_PROPERTY(QSet<QProperty *> subsettedProperties READ subsettedProperties) - Q_PROPERTY(QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) - Q_PROPERTY(QList<QProperty *> qualifiers READ qualifiers) - Q_PROPERTY(QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) - Q_PROPERTY(QClass * class_ READ class_ WRITE setClass_) - Q_PROPERTY(QProperty * opposite READ opposite WRITE setOpposite STORED false) - Q_PROPERTY(QProperty * associationEnd READ associationEnd WRITE setAssociationEnd) - Q_PROPERTY(QDataType * datatype READ datatype WRITE setDatatype) - Q_PROPERTY(QSet<QProperty *> redefinedProperties READ redefinedProperties) - Q_PROPERTY(QAssociation * association READ association WRITE setAssociation) - Q_PROPERTY(QInterface * interface_ READ interface_ WRITE setInterface_) + Q_PROPERTY(QtUmlNS::AggregationKind aggregation READ aggregation WRITE setAggregation RESET unsetAggregation) + Q_PROPERTY(QSet<QtUml::QProperty *> subsettedProperties READ subsettedProperties) + Q_PROPERTY(QtUml::QAssociation * owningAssociation READ owningAssociation WRITE setOwningAssociation) + Q_PROPERTY(QList<QtUml::QProperty *> qualifiers READ qualifiers) + Q_PROPERTY(QtUml::QValueSpecification * defaultValue READ defaultValue WRITE setDefaultValue) + Q_PROPERTY(QtUml::QClass * class_ READ class_ WRITE setClass_) + Q_PROPERTY(QtUml::QProperty * opposite READ opposite WRITE setOpposite STORED false) + Q_PROPERTY(QtUml::QProperty * associationEnd READ associationEnd WRITE setAssociationEnd) + Q_PROPERTY(QtUml::QDataType * datatype READ datatype WRITE setDatatype) + Q_PROPERTY(QSet<QtUml::QProperty *> redefinedProperties READ redefinedProperties) + Q_PROPERTY(QtUml::QAssociation * association READ association WRITE setAssociation) + Q_PROPERTY(QtUml::QInterface * interface_ READ interface_ WRITE setInterface_) Q_DISABLE_COPY(QProperty) Q_DECLARE_PRIVATE(QProperty) @@ -150,8 +153,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -235,8 +238,8 @@ public: Q_INVOKABLE bool isDerivedUnion() const; Q_INVOKABLE void setDerivedUnion(bool isDerivedUnion); Q_INVOKABLE void unsetDerivedUnion(); - Q_INVOKABLE QtUml::AggregationKind aggregation() const; - Q_INVOKABLE void setAggregation(QtUml::AggregationKind aggregation); + Q_INVOKABLE QtUmlNS::AggregationKind aggregation() const; + Q_INVOKABLE void setAggregation(QtUmlNS::AggregationKind aggregation); Q_INVOKABLE void unsetAggregation(); // Association ends from QProperty @@ -284,7 +287,9 @@ private: QDeploymentTarget *_wrappedDeploymentTarget; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qproperty_p.h b/src/uml/qproperty_p.h index db0031e7..df4802a0 100644 --- a/src/uml/qproperty_p.h +++ b/src/uml/qproperty_p.h @@ -59,7 +59,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -86,7 +89,7 @@ public: bool isReadOnly; bool isID; bool isDerivedUnion; - QtUml::AggregationKind aggregation; + QtUmlNS::AggregationKind aggregation; QSet<QProperty *> subsettedProperties; QAssociation *owningAssociation; QList<QProperty *> qualifiers; @@ -99,7 +102,9 @@ public: QInterface *interface_; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprotocolconformance.cpp b/src/uml/qprotocolconformance.cpp index fa0c70de..2514b1ca 100644 --- a/src/uml/qprotocolconformance.cpp +++ b/src/uml/qprotocolconformance.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QProtocolConformancePrivate::QProtocolConformancePrivate() : specificMachine(0), @@ -155,24 +158,26 @@ void QProtocolConformance::setGeneralMachine(QProtocolStateMachine *generalMachi void QProtocolConformance::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the state machine which conforms to the general state machine."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProtocolStateMachine::conformance"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the protocol state machine to which the specific state machine conforms."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the state machine which conforms to the general state machine."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProtocolStateMachine::conformance"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the protocol state machine to which the specific state machine conforms."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolConformance")][QString::fromLatin1("generalMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QDirectedRelationship::setPropertyData(); } -#include "moc_qprotocolconformance.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qprotocolconformance.cpp" diff --git a/src/uml/qprotocolconformance.h b/src/uml/qprotocolconformance.h index 48ce46bf..4c674f36 100644 --- a/src/uml/qprotocolconformance.h +++ b/src/uml/qprotocolconformance.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QProtocolConformance : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(QProtocolStateMachine * specificMachine READ specificMachine WRITE setSpecificMachine) - Q_PROPERTY(QProtocolStateMachine * generalMachine READ generalMachine WRITE setGeneralMachine) + Q_PROPERTY(QtUml::QProtocolStateMachine * specificMachine READ specificMachine WRITE setSpecificMachine) + Q_PROPERTY(QtUml::QProtocolStateMachine * generalMachine READ generalMachine WRITE setGeneralMachine) Q_DISABLE_COPY(QProtocolConformance) Q_DECLARE_PRIVATE(QProtocolConformance) @@ -83,7 +86,9 @@ protected: explicit QProtocolConformance(QProtocolConformancePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprotocolconformance_p.h b/src/uml/qprotocolconformance_p.h index 3b5ed0c6..e42ba854 100644 --- a/src/uml/qprotocolconformance_p.h +++ b/src/uml/qprotocolconformance_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QProtocolStateMachine *generalMachine; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprotocolstatemachine.cpp b/src/uml/qprotocolstatemachine.cpp index b0325468..20a707a9 100644 --- a/src/uml/qprotocolstatemachine.cpp +++ b/src/uml/qprotocolstatemachine.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QProtocolStateMachinePrivate::QProtocolStateMachinePrivate() { @@ -129,17 +132,19 @@ void QProtocolStateMachine::removeConformance(QProtocolConformance *conformance) void QProtocolStateMachine::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Conformance between protocol state machines."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProtocolConformance::specificMachine"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Conformance between protocol state machines."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QProtocolConformance::specificMachine"); QStateMachine::setPropertyData(); } -#include "moc_qprotocolstatemachine.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qprotocolstatemachine.cpp" diff --git a/src/uml/qprotocolstatemachine.h b/src/uml/qprotocolstatemachine.h index eb15753c..31da7f8b 100644 --- a/src/uml/qprotocolstatemachine.h +++ b/src/uml/qprotocolstatemachine.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QProtocolStateMachine : public QStateMachine { Q_OBJECT - Q_PROPERTY(QSet<QProtocolConformance *> conformance READ conformance) + Q_PROPERTY(QSet<QtUml::QProtocolConformance *> conformance READ conformance) Q_DISABLE_COPY(QProtocolStateMachine) Q_DECLARE_PRIVATE(QProtocolStateMachine) @@ -84,7 +87,9 @@ protected: explicit QProtocolStateMachine(QProtocolStateMachinePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprotocolstatemachine_p.h b/src/uml/qprotocolstatemachine_p.h index 19dd2187..5283f912 100644 --- a/src/uml/qprotocolstatemachine_p.h +++ b/src/uml/qprotocolstatemachine_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QSet<QProtocolConformance *> conformance; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprotocoltransition.cpp b/src/uml/qprotocoltransition.cpp index fb28d782..d40c9b17 100644 --- a/src/uml/qprotocoltransition.cpp +++ b/src/uml/qprotocoltransition.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QProtocolTransitionPrivate::QProtocolTransitionPrivate() : postCondition(0), @@ -154,31 +157,33 @@ void QProtocolTransition::setPreCondition(QConstraint *preCondition) void QProtocolTransition::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the post condition of the transition which is the condition that should be obtained once the transition is triggered. This post condition is part of the post condition of the operation connected to the transition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This association refers to the associated operation. It is derived from the operation of the call trigger when applicable."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the precondition of the transition. It specifies the condition that should be verified before triggering the transition. This guard condition added to the source state will be evaluated as part of the precondition of the operation referred by the transition if any."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTransition::guard"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the post condition of the transition which is the condition that should be obtained once the transition is triggered. This post condition is part of the post condition of the operation connected to the transition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This association refers to the associated operation. It is derived from the operation of the call trigger when applicable."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("referred")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the precondition of the transition. It specifies the condition that should be verified before triggering the transition. This guard condition added to the source state will be evaluated as part of the precondition of the operation referred by the transition if any."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTransition::guard"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QProtocolTransition")][QString::fromLatin1("preCondition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QTransition::setPropertyData(); } -#include "moc_qprotocoltransition.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qprotocoltransition.cpp" diff --git a/src/uml/qprotocoltransition.h b/src/uml/qprotocoltransition.h index d2042dd4..4ed49780 100644 --- a/src/uml/qprotocoltransition.h +++ b/src/uml/qprotocoltransition.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,9 +68,9 @@ class Q_UML_EXPORT QProtocolTransition : public QTransition { Q_OBJECT - Q_PROPERTY(QConstraint * postCondition READ postCondition WRITE setPostCondition) - Q_PROPERTY(QSet<QOperation *> referred READ referred STORED false) - Q_PROPERTY(QConstraint * preCondition READ preCondition WRITE setPreCondition) + Q_PROPERTY(QtUml::QConstraint * postCondition READ postCondition WRITE setPostCondition) + Q_PROPERTY(QSet<QtUml::QOperation *> referred READ referred STORED false) + Q_PROPERTY(QtUml::QConstraint * preCondition READ preCondition WRITE setPreCondition) Q_DISABLE_COPY(QProtocolTransition) Q_DECLARE_PRIVATE(QProtocolTransition) @@ -89,7 +92,9 @@ protected: explicit QProtocolTransition(QProtocolTransitionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qprotocoltransition_p.h b/src/uml/qprotocoltransition_p.h index ff534158..2e0084c1 100644 --- a/src/uml/qprotocoltransition_p.h +++ b/src/uml/qprotocoltransition_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QConstraint *preCondition; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpseudostate.cpp b/src/uml/qpseudostate.cpp index d79b0e52..40938d0c 100644 --- a/src/uml/qpseudostate.cpp +++ b/src/uml/qpseudostate.cpp @@ -47,10 +47,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QPseudostatePrivate::QPseudostatePrivate() : - kind(QtUml::PseudostateInitial), + kind(QtUmlNS::PseudostateInitial), state(0), stateMachine(0) { @@ -91,7 +94,7 @@ QPseudostate::~QPseudostate() /*! Determines the precise type of the Pseudostate and can be one of: entryPoint, exitPoint, initial, deepHistory, shallowHistory, join, fork, junction, terminate or choice. */ -QtUml::PseudostateKind QPseudostate::kind() const +QtUmlNS::PseudostateKind QPseudostate::kind() const { // This is a read-write attribute @@ -99,7 +102,7 @@ QtUml::PseudostateKind QPseudostate::kind() const return d->kind; } -void QPseudostate::setKind(QtUml::PseudostateKind kind) +void QPseudostate::setKind(QtUmlNS::PseudostateKind kind) { // This is a read-write attribute @@ -112,7 +115,7 @@ void QPseudostate::setKind(QtUml::PseudostateKind kind) void QPseudostate::unsetKind() { - setKind(QtUml::PseudostateInitial); + setKind(QtUmlNS::PseudostateInitial); Q_D(QPseudostate); d->modifiedResettableProperties.removeAll(QString::fromLatin1("kind")); } @@ -187,31 +190,33 @@ void QPseudostate::setStateMachine(QStateMachine *stateMachine) void QPseudostate::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines the precise type of the Pseudostate and can be one of: entryPoint, exitPoint, initial, deepHistory, shallowHistory, join, fork, junction, terminate or choice."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The State that owns this pseudostate and in which it appears."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::connectionPoint"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The StateMachine in which this Pseudostate is defined. This only applies to Pseudostates of the kind entryPoint or exitPoint."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStateMachine::connectionPoint"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Determines the precise type of the Pseudostate and can be one of: entryPoint, exitPoint, initial, deepHistory, shallowHistory, join, fork, junction, terminate or choice."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The State that owns this pseudostate and in which it appears."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("state")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::connectionPoint"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The StateMachine in which this Pseudostate is defined. This only applies to Pseudostates of the kind entryPoint or exitPoint."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QPseudostate")][QString::fromLatin1("stateMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStateMachine::connectionPoint"); QVertex::setPropertyData(); } -#include "moc_qpseudostate.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qpseudostate.cpp" diff --git a/src/uml/qpseudostate.h b/src/uml/qpseudostate.h index 610171b8..31508250 100644 --- a/src/uml/qpseudostate.h +++ b/src/uml/qpseudostate.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,9 +68,9 @@ class Q_UML_EXPORT QPseudostate : public QVertex { Q_OBJECT - Q_PROPERTY(QtUml::PseudostateKind kind READ kind WRITE setKind RESET unsetKind) - Q_PROPERTY(QState * state READ state WRITE setState) - Q_PROPERTY(QStateMachine * stateMachine READ stateMachine WRITE setStateMachine) + Q_PROPERTY(QtUmlNS::PseudostateKind kind READ kind WRITE setKind RESET unsetKind) + Q_PROPERTY(QtUml::QState * state READ state WRITE setState) + Q_PROPERTY(QtUml::QStateMachine * stateMachine READ stateMachine WRITE setStateMachine) Q_DISABLE_COPY(QPseudostate) Q_DECLARE_PRIVATE(QPseudostate) @@ -77,8 +80,8 @@ public: virtual ~QPseudostate(); // Attributes from QPseudostate - Q_INVOKABLE QtUml::PseudostateKind kind() const; - Q_INVOKABLE void setKind(QtUml::PseudostateKind kind); + Q_INVOKABLE QtUmlNS::PseudostateKind kind() const; + Q_INVOKABLE void setKind(QtUmlNS::PseudostateKind kind); Q_INVOKABLE void unsetKind(); // Association ends from QPseudostate @@ -93,7 +96,9 @@ protected: explicit QPseudostate(QPseudostatePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qpseudostate_p.h b/src/uml/qpseudostate_p.h index b9b7c28a..11cd6e1b 100644 --- a/src/uml/qpseudostate_p.h +++ b/src/uml/qpseudostate_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,12 +71,14 @@ public: explicit QPseudostatePrivate(); virtual ~QPseudostatePrivate(); - QtUml::PseudostateKind kind; + QtUmlNS::PseudostateKind kind; QState *state; QStateMachine *stateMachine; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qqualifiervalue.cpp b/src/uml/qqualifiervalue.cpp index 4d3e8af7..a04d9e0e 100644 --- a/src/uml/qqualifiervalue.cpp +++ b/src/uml/qqualifiervalue.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QQualifierValuePrivate::QQualifierValuePrivate() : value(0), @@ -131,24 +134,26 @@ void QQualifierValue::setQualifier(QProperty *qualifier) void QQualifierValue::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Input pin from which the specified value for the qualifier is taken."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Attribute representing the qualifier for which the value is to be specified."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Input pin from which the specified value for the qualifier is taken."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Attribute representing the qualifier for which the value is to be specified."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QQualifierValue")][QString::fromLatin1("qualifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qqualifiervalue.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qqualifiervalue.cpp" diff --git a/src/uml/qqualifiervalue.h b/src/uml/qqualifiervalue.h index dfd212b0..bdb6b2b4 100644 --- a/src/uml/qqualifiervalue.h +++ b/src/uml/qqualifiervalue.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QQualifierValue : public QElement { Q_OBJECT - Q_PROPERTY(QInputPin * value READ value WRITE setValue) - Q_PROPERTY(QProperty * qualifier READ qualifier WRITE setQualifier) + Q_PROPERTY(QtUml::QInputPin * value READ value WRITE setValue) + Q_PROPERTY(QtUml::QProperty * qualifier READ qualifier WRITE setQualifier) Q_DISABLE_COPY(QQualifierValue) Q_DECLARE_PRIVATE(QQualifierValue) @@ -84,7 +87,9 @@ protected: explicit QQualifierValue(QQualifierValuePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qqualifiervalue_p.h b/src/uml/qqualifiervalue_p.h index 8d963cc0..c4524589 100644 --- a/src/uml/qqualifiervalue_p.h +++ b/src/uml/qqualifiervalue_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QProperty *qualifier; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qraiseexceptionaction.cpp b/src/uml/qraiseexceptionaction.cpp index ba911a23..887b1d80 100644 --- a/src/uml/qraiseexceptionaction.cpp +++ b/src/uml/qraiseexceptionaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRaiseExceptionActionPrivate::QRaiseExceptionActionPrivate() : exception(0) @@ -116,17 +119,19 @@ void QRaiseExceptionAction::setException(QInputPin *exception) void QRaiseExceptionAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An input pin whose value becomes an exception object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An input pin whose value becomes an exception object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qraiseexceptionaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qraiseexceptionaction.cpp" diff --git a/src/uml/qraiseexceptionaction.h b/src/uml/qraiseexceptionaction.h index 242aed04..83a0edd2 100644 --- a/src/uml/qraiseexceptionaction.h +++ b/src/uml/qraiseexceptionaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QRaiseExceptionAction : public QAction { Q_OBJECT - Q_PROPERTY(QInputPin * exception READ exception WRITE setException) + Q_PROPERTY(QtUml::QInputPin * exception READ exception WRITE setException) Q_DISABLE_COPY(QRaiseExceptionAction) Q_DECLARE_PRIVATE(QRaiseExceptionAction) @@ -80,7 +83,9 @@ protected: explicit QRaiseExceptionAction(QRaiseExceptionActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qraiseexceptionaction_p.h b/src/uml/qraiseexceptionaction_p.h index 43c32a83..1deb1d35 100644 --- a/src/uml/qraiseexceptionaction_p.h +++ b/src/uml/qraiseexceptionaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QInputPin *exception; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadextentaction.cpp b/src/uml/qreadextentaction.cpp index 2ccfc552..fe99cc51 100644 --- a/src/uml/qreadextentaction.cpp +++ b/src/uml/qreadextentaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadExtentActionPrivate::QReadExtentActionPrivate() : classifier(0), @@ -139,24 +142,26 @@ void QReadExtentAction::setResult(QOutputPin *result) void QReadExtentAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier whose instances are to be retrieved."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The runtime instances of the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier whose instances are to be retrieved."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The runtime instances of the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadExtentAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreadextentaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadextentaction.cpp" diff --git a/src/uml/qreadextentaction.h b/src/uml/qreadextentaction.h index ef172ef2..b0fdc9ad 100644 --- a/src/uml/qreadextentaction.h +++ b/src/uml/qreadextentaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QReadExtentAction : public QAction { Q_OBJECT - Q_PROPERTY(QClassifier * classifier READ classifier WRITE setClassifier) - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QClassifier * classifier READ classifier WRITE setClassifier) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QReadExtentAction) Q_DECLARE_PRIVATE(QReadExtentAction) @@ -84,7 +87,9 @@ protected: explicit QReadExtentAction(QReadExtentActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadextentaction_p.h b/src/uml/qreadextentaction_p.h index aaf68368..d1cc8a0a 100644 --- a/src/uml/qreadextentaction_p.h +++ b/src/uml/qreadextentaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadisclassifiedobjectaction.cpp b/src/uml/qreadisclassifiedobjectaction.cpp index 508cebbd..bd2ad3a5 100644 --- a/src/uml/qreadisclassifiedobjectaction.cpp +++ b/src/uml/qreadisclassifiedobjectaction.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadIsClassifiedObjectActionPrivate::QReadIsClassifiedObjectActionPrivate() : isDirect(false), @@ -204,38 +207,40 @@ void QReadIsClassifiedObjectAction::setClassifier(QClassifier *classifier) void QReadIsClassifiedObjectAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether the classifier must directly classify the input object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("After termination of the action, will hold the result of the test."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object whose classification is to be tested."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier against which the classification of the input object is tested."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether the classifier must directly classify the input object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("After termination of the action, will hold the result of the test."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object whose classification is to be tested."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier against which the classification of the input object is tested."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadIsClassifiedObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreadisclassifiedobjectaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadisclassifiedobjectaction.cpp" diff --git a/src/uml/qreadisclassifiedobjectaction.h b/src/uml/qreadisclassifiedobjectaction.h index 5ebe0a64..2c230a62 100644 --- a/src/uml/qreadisclassifiedobjectaction.h +++ b/src/uml/qreadisclassifiedobjectaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,9 +67,9 @@ class Q_UML_EXPORT QReadIsClassifiedObjectAction : public QAction Q_OBJECT Q_PROPERTY(bool isDirect READ isDirect WRITE setDirect RESET unsetDirect) - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) - Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(QClassifier * classifier READ classifier WRITE setClassifier) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QtUml::QClassifier * classifier READ classifier WRITE setClassifier) Q_DISABLE_COPY(QReadIsClassifiedObjectAction) Q_DECLARE_PRIVATE(QReadIsClassifiedObjectAction) @@ -94,7 +97,9 @@ protected: explicit QReadIsClassifiedObjectAction(QReadIsClassifiedObjectActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadisclassifiedobjectaction_p.h b/src/uml/qreadisclassifiedobjectaction_p.h index efc70bb1..6b5afce2 100644 --- a/src/uml/qreadisclassifiedobjectaction_p.h +++ b/src/uml/qreadisclassifiedobjectaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QClassifier *classifier; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadlinkaction.cpp b/src/uml/qreadlinkaction.cpp index c01ef3f3..6f1ffee3 100644 --- a/src/uml/qreadlinkaction.cpp +++ b/src/uml/qreadlinkaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadLinkActionPrivate::QReadLinkActionPrivate() : result(0) @@ -116,17 +119,19 @@ void QReadLinkAction::setResult(QOutputPin *result) void QReadLinkAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The pin on which are put the objects participating in the association at the end not specified by the inputs."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The pin on which are put the objects participating in the association at the end not specified by the inputs."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QLinkAction::setPropertyData(); } -#include "moc_qreadlinkaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadlinkaction.cpp" diff --git a/src/uml/qreadlinkaction.h b/src/uml/qreadlinkaction.h index 1ddda262..652a2558 100644 --- a/src/uml/qreadlinkaction.h +++ b/src/uml/qreadlinkaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QReadLinkAction : public QLinkAction { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QReadLinkAction) Q_DECLARE_PRIVATE(QReadLinkAction) @@ -80,7 +83,9 @@ protected: explicit QReadLinkAction(QReadLinkActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadlinkaction_p.h b/src/uml/qreadlinkaction_p.h index 677386b6..616e16d0 100644 --- a/src/uml/qreadlinkaction_p.h +++ b/src/uml/qreadlinkaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadlinkobjectendaction.cpp b/src/uml/qreadlinkobjectendaction.cpp index b95fdc8c..2b0fd63c 100644 --- a/src/uml/qreadlinkobjectendaction.cpp +++ b/src/uml/qreadlinkobjectendaction.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadLinkObjectEndActionPrivate::QReadLinkObjectEndActionPrivate() : end(0), @@ -170,31 +173,33 @@ void QReadLinkObjectEndAction::setResult(QOutputPin *result) void QReadLinkObjectEndAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Link end to be read."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which the link object is obtained."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pin where the result value is placed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Link end to be read."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which the link object is obtained."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pin where the result value is placed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreadlinkobjectendaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadlinkobjectendaction.cpp" diff --git a/src/uml/qreadlinkobjectendaction.h b/src/uml/qreadlinkobjectendaction.h index 6bf7efc9..c3796a47 100644 --- a/src/uml/qreadlinkobjectendaction.h +++ b/src/uml/qreadlinkobjectendaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,9 +66,9 @@ class Q_UML_EXPORT QReadLinkObjectEndAction : public QAction { Q_OBJECT - Q_PROPERTY(QProperty * end READ end WRITE setEnd) - Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QProperty * end READ end WRITE setEnd) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QReadLinkObjectEndAction) Q_DECLARE_PRIVATE(QReadLinkObjectEndAction) @@ -88,7 +91,9 @@ protected: explicit QReadLinkObjectEndAction(QReadLinkObjectEndActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadlinkobjectendaction_p.h b/src/uml/qreadlinkobjectendaction_p.h index 5ac4fafe..16e894f9 100644 --- a/src/uml/qreadlinkobjectendaction_p.h +++ b/src/uml/qreadlinkobjectendaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadlinkobjectendqualifieraction.cpp b/src/uml/qreadlinkobjectendqualifieraction.cpp index 7f8c1ce1..a6958617 100644 --- a/src/uml/qreadlinkobjectendqualifieraction.cpp +++ b/src/uml/qreadlinkobjectendqualifieraction.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadLinkObjectEndQualifierActionPrivate::QReadLinkObjectEndQualifierActionPrivate() : result(0), @@ -170,31 +173,33 @@ void QReadLinkObjectEndQualifierAction::setQualifier(QProperty *qualifier) void QReadLinkObjectEndQualifierAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pin where the result value is placed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which the link object is obtained."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attribute representing the qualifier to be read."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Pin where the result value is placed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which the link object is obtained."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attribute representing the qualifier to be read."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadLinkObjectEndQualifierAction")][QString::fromLatin1("qualifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreadlinkobjectendqualifieraction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadlinkobjectendqualifieraction.cpp" diff --git a/src/uml/qreadlinkobjectendqualifieraction.h b/src/uml/qreadlinkobjectendqualifieraction.h index 16fcbd92..6381dda9 100644 --- a/src/uml/qreadlinkobjectendqualifieraction.h +++ b/src/uml/qreadlinkobjectendqualifieraction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,9 +66,9 @@ class Q_UML_EXPORT QReadLinkObjectEndQualifierAction : public QAction { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) - Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(QProperty * qualifier READ qualifier WRITE setQualifier) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QtUml::QProperty * qualifier READ qualifier WRITE setQualifier) Q_DISABLE_COPY(QReadLinkObjectEndQualifierAction) Q_DECLARE_PRIVATE(QReadLinkObjectEndQualifierAction) @@ -88,7 +91,9 @@ protected: explicit QReadLinkObjectEndQualifierAction(QReadLinkObjectEndQualifierActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadlinkobjectendqualifieraction_p.h b/src/uml/qreadlinkobjectendqualifieraction_p.h index a32abf1d..377d48d8 100644 --- a/src/uml/qreadlinkobjectendqualifieraction_p.h +++ b/src/uml/qreadlinkobjectendqualifieraction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QProperty *qualifier; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadselfaction.cpp b/src/uml/qreadselfaction.cpp index eb773fe1..3a1518f2 100644 --- a/src/uml/qreadselfaction.cpp +++ b/src/uml/qreadselfaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadSelfActionPrivate::QReadSelfActionPrivate() : result(0) @@ -116,17 +119,19 @@ void QReadSelfAction::setResult(QOutputPin *result) void QReadSelfAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the hosting object is placed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the hosting object is placed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreadselfaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadselfaction.cpp" diff --git a/src/uml/qreadselfaction.h b/src/uml/qreadselfaction.h index 4f15e86e..b591f180 100644 --- a/src/uml/qreadselfaction.h +++ b/src/uml/qreadselfaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QReadSelfAction : public QAction { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QReadSelfAction) Q_DECLARE_PRIVATE(QReadSelfAction) @@ -80,7 +83,9 @@ protected: explicit QReadSelfAction(QReadSelfActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadselfaction_p.h b/src/uml/qreadselfaction_p.h index 0c5adab1..97575c81 100644 --- a/src/uml/qreadselfaction_p.h +++ b/src/uml/qreadselfaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadstructuralfeatureaction.cpp b/src/uml/qreadstructuralfeatureaction.cpp index 09cf6621..906b4c77 100644 --- a/src/uml/qreadstructuralfeatureaction.cpp +++ b/src/uml/qreadstructuralfeatureaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadStructuralFeatureActionPrivate::QReadStructuralFeatureActionPrivate() : result(0) @@ -116,17 +119,19 @@ void QReadStructuralFeatureAction::setResult(QOutputPin *result) void QReadStructuralFeatureAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QStructuralFeatureAction::setPropertyData(); } -#include "moc_qreadstructuralfeatureaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadstructuralfeatureaction.cpp" diff --git a/src/uml/qreadstructuralfeatureaction.h b/src/uml/qreadstructuralfeatureaction.h index a98a3e02..b3938fd6 100644 --- a/src/uml/qreadstructuralfeatureaction.h +++ b/src/uml/qreadstructuralfeatureaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QReadStructuralFeatureAction : public QStructuralFeatureActio { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QReadStructuralFeatureAction) Q_DECLARE_PRIVATE(QReadStructuralFeatureAction) @@ -80,7 +83,9 @@ protected: explicit QReadStructuralFeatureAction(QReadStructuralFeatureActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadstructuralfeatureaction_p.h b/src/uml/qreadstructuralfeatureaction_p.h index b0496790..bffb02f1 100644 --- a/src/uml/qreadstructuralfeatureaction_p.h +++ b/src/uml/qreadstructuralfeatureaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadvariableaction.cpp b/src/uml/qreadvariableaction.cpp index 84820457..16f2d3f9 100644 --- a/src/uml/qreadvariableaction.cpp +++ b/src/uml/qreadvariableaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReadVariableActionPrivate::QReadVariableActionPrivate() : result(0) @@ -116,17 +119,19 @@ void QReadVariableAction::setResult(QOutputPin *result) void QReadVariableAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QVariableAction::setPropertyData(); } -#include "moc_qreadvariableaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreadvariableaction.cpp" diff --git a/src/uml/qreadvariableaction.h b/src/uml/qreadvariableaction.h index 3039f648..077d5cd1 100644 --- a/src/uml/qreadvariableaction.h +++ b/src/uml/qreadvariableaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QReadVariableAction : public QVariableAction { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QReadVariableAction) Q_DECLARE_PRIVATE(QReadVariableAction) @@ -80,7 +83,9 @@ protected: explicit QReadVariableAction(QReadVariableActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreadvariableaction_p.h b/src/uml/qreadvariableaction_p.h index c56ebed9..bc657a67 100644 --- a/src/uml/qreadvariableaction_p.h +++ b/src/uml/qreadvariableaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qrealization.cpp b/src/uml/qrealization.cpp index 871ca806..1a32a4ee 100644 --- a/src/uml/qrealization.cpp +++ b/src/uml/qrealization.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRealizationPrivate::QRealizationPrivate() { @@ -83,7 +86,9 @@ void QRealization::setPropertyData() QAbstraction::setPropertyData(); } -#include "moc_qrealization.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qrealization.cpp" diff --git a/src/uml/qrealization.h b/src/uml/qrealization.h index 1a71289a..7aa832df 100644 --- a/src/uml/qrealization.h +++ b/src/uml/qrealization.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QRealization(QRealizationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qrealization_p.h b/src/uml/qrealization_p.h index 4060e57c..92370068 100644 --- a/src/uml/qrealization_p.h +++ b/src/uml/qrealization_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QRealization; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreception.cpp b/src/uml/qreception.cpp index 43a4e412..06080c8f 100644 --- a/src/uml/qreception.cpp +++ b/src/uml/qreception.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReceptionPrivate::QReceptionPrivate() : signal(0) @@ -108,17 +111,19 @@ void QReception::setSignal(QSignal *signal) void QReception::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReception")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReception")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReception")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The signal that this reception handles."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReception")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReception")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReception")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReception")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReception")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReception")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The signal that this reception handles."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReception")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReception")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReception")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QBehavioralFeature::setPropertyData(); } -#include "moc_qreception.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreception.cpp" diff --git a/src/uml/qreception.h b/src/uml/qreception.h index 0d8e8e09..059bf884 100644 --- a/src/uml/qreception.h +++ b/src/uml/qreception.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QReception : public QBehavioralFeature { Q_OBJECT - Q_PROPERTY(QSignal * signal READ signal WRITE setSignal) + Q_PROPERTY(QtUml::QSignal * signal READ signal WRITE setSignal) Q_DISABLE_COPY(QReception) Q_DECLARE_PRIVATE(QReception) @@ -80,7 +83,9 @@ protected: explicit QReception(QReceptionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreception_p.h b/src/uml/qreception_p.h index a9d613fa..52b37fd2 100644 --- a/src/uml/qreception_p.h +++ b/src/uml/qreception_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QSignal *signal; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreclassifyobjectaction.cpp b/src/uml/qreclassifyobjectaction.cpp index f8a70962..2a4b3388 100644 --- a/src/uml/qreclassifyobjectaction.cpp +++ b/src/uml/qreclassifyobjectaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReclassifyObjectActionPrivate::QReclassifyObjectActionPrivate() : isReplaceAll(false), @@ -213,38 +216,40 @@ void QReclassifyObjectAction::removeNewClassifier(QClassifier *newClassifier) void QReclassifyObjectAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether existing classifiers should be removed before adding the new classifiers."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of classifiers to be removed from the classifiers of the object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object to be reclassified."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of classifiers to be added to the classifiers of the object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether existing classifiers should be removed before adding the new classifiers."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of classifiers to be removed from the classifiers of the object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("oldClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object to be reclassified."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A set of classifiers to be added to the classifiers of the object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReclassifyObjectAction")][QString::fromLatin1("newClassifiers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreclassifyobjectaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreclassifyobjectaction.cpp" diff --git a/src/uml/qreclassifyobjectaction.h b/src/uml/qreclassifyobjectaction.h index 933fce6a..00f10ac9 100644 --- a/src/uml/qreclassifyobjectaction.h +++ b/src/uml/qreclassifyobjectaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QReclassifyObjectAction : public QAction Q_OBJECT Q_PROPERTY(bool isReplaceAll READ isReplaceAll WRITE setReplaceAll RESET unsetReplaceAll) - Q_PROPERTY(QSet<QClassifier *> oldClassifiers READ oldClassifiers) - Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(QSet<QClassifier *> newClassifiers READ newClassifiers) + Q_PROPERTY(QSet<QtUml::QClassifier *> oldClassifiers READ oldClassifiers) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QSet<QtUml::QClassifier *> newClassifiers READ newClassifiers) Q_DISABLE_COPY(QReclassifyObjectAction) Q_DECLARE_PRIVATE(QReclassifyObjectAction) @@ -98,7 +101,9 @@ protected: explicit QReclassifyObjectAction(QReclassifyObjectActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreclassifyobjectaction_p.h b/src/uml/qreclassifyobjectaction_p.h index 322b462f..a844a98b 100644 --- a/src/uml/qreclassifyobjectaction_p.h +++ b/src/uml/qreclassifyobjectaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QSet<QClassifier *> newClassifiers; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qredefinableelement.cpp b/src/uml/qredefinableelement.cpp index 975062ec..13156a85 100644 --- a/src/uml/qredefinableelement.cpp +++ b/src/uml/qredefinableelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRedefinableElementPrivate::QRedefinableElementPrivate() : isLeaf(false) @@ -200,31 +203,33 @@ bool QRedefinableElement::isRedefinitionContextValid(const QRedefinableElement * void QRedefinableElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether it is possible to further redefine a RedefinableElement. If the value is true, then it is not possible to further redefine the RedefinableElement. Note that this property is preserved through package merge operations; that is, the capability to redefine a RedefinableElement (i.e., isLeaf=false) must be preserved in the resulting RedefinableElement of a package merge operation where a RedefinableElement with isLeaf=false is merged with a matching RedefinableElement with isLeaf=true: the resulting RedefinableElement will have isLeaf=false. Default value is false."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The redefinable element that is being redefined by this element."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the contexts that this element may be redefined from."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates whether it is possible to further redefine a RedefinableElement. If the value is true, then it is not possible to further redefine the RedefinableElement. Note that this property is preserved through package merge operations; that is, the capability to redefine a RedefinableElement (i.e., isLeaf=false) must be preserved in the resulting RedefinableElement of a package merge operation where a RedefinableElement with isLeaf=false is merged with a matching RedefinableElement with isLeaf=true: the resulting RedefinableElement will have isLeaf=false. Default value is false."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The redefinable element that is being redefined by this element."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the contexts that this element may be redefined from."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableElement")][QString::fromLatin1("redefinitionContexts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qredefinableelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qredefinableelement.cpp" diff --git a/src/uml/qredefinableelement.h b/src/uml/qredefinableelement.h index b4aaa064..5265466b 100644 --- a/src/uml/qredefinableelement.h +++ b/src/uml/qredefinableelement.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QRedefinableElement : public QNamedElement Q_OBJECT Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_DISABLE_COPY(QRedefinableElement) Q_DECLARE_PRIVATE(QRedefinableElement) @@ -94,7 +97,9 @@ protected: explicit QRedefinableElement(QRedefinableElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qredefinableelement_p.h b/src/uml/qredefinableelement_p.h index bf2b05c9..eac7b030 100644 --- a/src/uml/qredefinableelement_p.h +++ b/src/uml/qredefinableelement_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -78,7 +81,9 @@ public: void removeRedefinitionContext(QClassifier *redefinitionContext); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qredefinabletemplatesignature.cpp b/src/uml/qredefinabletemplatesignature.cpp index 43a0ccdc..eb3ae6b5 100644 --- a/src/uml/qredefinabletemplatesignature.cpp +++ b/src/uml/qredefinabletemplatesignature.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRedefinableTemplateSignaturePrivate::QRedefinableTemplateSignaturePrivate() : classifier(0) @@ -144,12 +147,12 @@ void QRedefinableTemplateSignature::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QRedefinableTemplateSignature::visibility() const +QtUmlNS::VisibilityKind QRedefinableTemplateSignature::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QRedefinableTemplateSignature::setVisibility(QtUml::VisibilityKind visibility) +void QRedefinableTemplateSignature::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -352,31 +355,33 @@ bool QRedefinableTemplateSignature::isConsistentWith(const QRedefinableElement * void QRedefinableTemplateSignature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameters of the extendedSignature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTemplateSignature::parameters"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier that owns this template signature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateSignature::template"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::ownedTemplateSignature"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template signature that is extended by this template signature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameters of the extendedSignature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTemplateSignature::parameters"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The classifier that owns this template signature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QTemplateSignature::template"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("classifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::ownedTemplateSignature"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template signature that is extended by this template signature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRedefinableTemplateSignature")][QString::fromLatin1("extendedSignatures")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qredefinabletemplatesignature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qredefinabletemplatesignature.cpp" diff --git a/src/uml/qredefinabletemplatesignature.h b/src/uml/qredefinabletemplatesignature.h index 8038aea5..19f35cdd 100644 --- a/src/uml/qredefinabletemplatesignature.h +++ b/src/uml/qredefinabletemplatesignature.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,24 +70,24 @@ class Q_UML_EXPORT QRedefinableTemplateSignature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QTemplateParameter *> inheritedParameters READ inheritedParameters STORED false) - Q_PROPERTY(QClassifier * classifier READ classifier WRITE setClassifier) - Q_PROPERTY(QSet<QRedefinableTemplateSignature *> extendedSignatures READ extendedSignatures) + Q_PROPERTY(QSet<QtUml::QTemplateParameter *> inheritedParameters READ inheritedParameters STORED false) + Q_PROPERTY(QtUml::QClassifier * classifier READ classifier WRITE setClassifier) + Q_PROPERTY(QSet<QtUml::QRedefinableTemplateSignature *> extendedSignatures READ extendedSignatures) Q_DISABLE_COPY(QRedefinableTemplateSignature) Q_DECLARE_PRIVATE(QRedefinableTemplateSignature) @@ -103,8 +106,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -145,7 +148,9 @@ private: QRedefinableElement *_wrappedRedefinableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qredefinabletemplatesignature_p.h b/src/uml/qredefinabletemplatesignature_p.h index 4561e00b..3b41a4d1 100644 --- a/src/uml/qredefinabletemplatesignature_p.h +++ b/src/uml/qredefinabletemplatesignature_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QSet<QRedefinableTemplateSignature *> extendedSignatures; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreduceaction.cpp b/src/uml/qreduceaction.cpp index 74cb5d2a..324a464d 100644 --- a/src/uml/qreduceaction.cpp +++ b/src/uml/qreduceaction.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReduceActionPrivate::QReduceActionPrivate() : isOrdered(false), @@ -204,38 +207,40 @@ void QReduceAction::setReducer(QBehavior *reducer) void QReduceAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the order of the input collection should determine the order in which the behavior is applied to its elements."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The collection to be reduced."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Behavior that is applied to two elements of the input collection to produce a value that is the same type as elements of the collection."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the order of the input collection should determine the order in which the behavior is applied to its elements."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The collection to be reduced."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("collection")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Behavior that is applied to two elements of the input collection to produce a value that is the same type as elements of the collection."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReduceAction")][QString::fromLatin1("reducer")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreduceaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreduceaction.cpp" diff --git a/src/uml/qreduceaction.h b/src/uml/qreduceaction.h index 380c0cc1..3df6e339 100644 --- a/src/uml/qreduceaction.h +++ b/src/uml/qreduceaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,9 +67,9 @@ class Q_UML_EXPORT QReduceAction : public QAction Q_OBJECT Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) - Q_PROPERTY(QInputPin * collection READ collection WRITE setCollection) - Q_PROPERTY(QBehavior * reducer READ reducer WRITE setReducer) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QInputPin * collection READ collection WRITE setCollection) + Q_PROPERTY(QtUml::QBehavior * reducer READ reducer WRITE setReducer) Q_DISABLE_COPY(QReduceAction) Q_DECLARE_PRIVATE(QReduceAction) @@ -94,7 +97,9 @@ protected: explicit QReduceAction(QReduceActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreduceaction_p.h b/src/uml/qreduceaction_p.h index bd9baba8..9461956c 100644 --- a/src/uml/qreduceaction_p.h +++ b/src/uml/qreduceaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QBehavior *reducer; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qregion.cpp b/src/uml/qregion.cpp index fd852db8..198ee9f1 100644 --- a/src/uml/qregion.cpp +++ b/src/uml/qregion.cpp @@ -50,7 +50,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRegionPrivate::QRegionPrivate() : extendedRegion(0), @@ -149,12 +152,12 @@ void QRegion::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QRegion::visibility() const +QtUmlNS::VisibilityKind QRegion::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QRegion::setVisibility(QtUml::VisibilityKind visibility) +void QRegion::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -567,52 +570,54 @@ bool QRegion::isRedefinitionContextValid(const QRegion *redefined) const void QRegion::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The region of which this region is an extension."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of transitions owned by the region."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTransition::container"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The StateMachine that owns the Region. If a Region is owned by a StateMachine, then it cannot also be owned by a State."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStateMachine::region"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("state")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("state")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("state")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The State that owns the Region. If a Region is owned by a State, then it cannot also be owned by a StateMachine."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("state")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("state")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("state")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::region"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifier in which context this element may be redefined."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of vertices that are owned by this region."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVertex::container"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The region of which this region is an extension."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of transitions owned by the region."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("transitions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTransition::container"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The StateMachine that owns the Region. If a Region is owned by a StateMachine, then it cannot also be owned by a State."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("stateMachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStateMachine::region"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("state")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("state")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("state")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The State that owns the Region. If a Region is owned by a State, then it cannot also be owned by a StateMachine."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("state")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("state")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("state")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::region"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifier in which context this element may be redefined."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The set of vertices that are owned by this region."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRegion")][QString::fromLatin1("subvertices")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVertex::container"); QWrappedObject::setPropertyData(); } -#include "moc_qregion.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qregion.cpp" diff --git a/src/uml/qregion.h b/src/uml/qregion.h index 0f9b2b24..4849c75b 100644 --- a/src/uml/qregion.h +++ b/src/uml/qregion.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,33 +73,33 @@ class Q_UML_EXPORT QRegion : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) - - Q_PROPERTY(QRegion * extendedRegion READ extendedRegion WRITE setExtendedRegion) - Q_PROPERTY(QSet<QTransition *> transitions READ transitions) - Q_PROPERTY(QStateMachine * stateMachine READ stateMachine WRITE setStateMachine) - Q_PROPERTY(QState * state READ state WRITE setState) - Q_PROPERTY(QClassifier * redefinitionContext READ redefinitionContext STORED false) - Q_PROPERTY(QSet<QVertex *> subvertices READ subvertices) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) + + Q_PROPERTY(QtUml::QRegion * extendedRegion READ extendedRegion WRITE setExtendedRegion) + Q_PROPERTY(QSet<QtUml::QTransition *> transitions READ transitions) + Q_PROPERTY(QtUml::QStateMachine * stateMachine READ stateMachine WRITE setStateMachine) + Q_PROPERTY(QtUml::QState * state READ state WRITE setState) + Q_PROPERTY(QtUml::QClassifier * redefinitionContext READ redefinitionContext STORED false) + Q_PROPERTY(QSet<QtUml::QVertex *> subvertices READ subvertices) Q_DISABLE_COPY(QRegion) Q_DECLARE_PRIVATE(QRegion) @@ -115,8 +118,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -180,7 +183,9 @@ private: QNamespace *_wrappedNamespace; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qregion_p.h b/src/uml/qregion_p.h index 6175c967..7cfa5172 100644 --- a/src/uml/qregion_p.h +++ b/src/uml/qregion_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -80,7 +83,9 @@ public: QSet<QVertex *> subvertices; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qrelationship.cpp b/src/uml/qrelationship.cpp index 89ec71ad..7c140ac3 100644 --- a/src/uml/qrelationship.cpp +++ b/src/uml/qrelationship.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRelationshipPrivate::QRelationshipPrivate() { @@ -113,17 +116,19 @@ QSet<QElement *> QRelationship::relatedElements() const void QRelationship::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the elements related by the Relationship."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the elements related by the Relationship."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QElement::setPropertyData(); } -#include "moc_qrelationship.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qrelationship.cpp" diff --git a/src/uml/qrelationship.h b/src/uml/qrelationship.h index 4c153a90..fe2158ad 100644 --- a/src/uml/qrelationship.h +++ b/src/uml/qrelationship.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QRelationship : public QElement { Q_OBJECT - Q_PROPERTY(QSet<QElement *> relatedElements READ relatedElements) + Q_PROPERTY(QSet<QtUml::QElement *> relatedElements READ relatedElements) Q_DISABLE_COPY(QRelationship) Q_DECLARE_PRIVATE(QRelationship) @@ -79,7 +82,9 @@ protected: explicit QRelationship(QRelationshipPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qrelationship_p.h b/src/uml/qrelationship_p.h index 14b55f87..490dddce 100644 --- a/src/uml/qrelationship_p.h +++ b/src/uml/qrelationship_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: void removeRelatedElement(QElement *relatedElement); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qremovestructuralfeaturevalueaction.cpp b/src/uml/qremovestructuralfeaturevalueaction.cpp index 4987fdd4..b833e064 100644 --- a/src/uml/qremovestructuralfeaturevalueaction.cpp +++ b/src/uml/qremovestructuralfeaturevalueaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRemoveStructuralFeatureValueActionPrivate::QRemoveStructuralFeatureValueActionPrivate() : isRemoveDuplicates(false), @@ -150,24 +153,26 @@ void QRemoveStructuralFeatureValueAction::setRemoveAt(QInputPin *removeAt) void QRemoveStructuralFeatureValueAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether to remove duplicates of the value in nonunique structural features."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the position of an existing value to remove in ordered nonunique structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether to remove duplicates of the value in nonunique structural features."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the position of an existing value to remove in ordered nonunique structural features. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveStructuralFeatureValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWriteStructuralFeatureAction::setPropertyData(); } -#include "moc_qremovestructuralfeaturevalueaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qremovestructuralfeaturevalueaction.cpp" diff --git a/src/uml/qremovestructuralfeaturevalueaction.h b/src/uml/qremovestructuralfeaturevalueaction.h index bfd5aec6..c069306f 100644 --- a/src/uml/qremovestructuralfeaturevalueaction.h +++ b/src/uml/qremovestructuralfeaturevalueaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QRemoveStructuralFeatureValueAction : public QWriteStructural Q_OBJECT Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates) - Q_PROPERTY(QInputPin * removeAt READ removeAt WRITE setRemoveAt) + Q_PROPERTY(QtUml::QInputPin * removeAt READ removeAt WRITE setRemoveAt) Q_DISABLE_COPY(QRemoveStructuralFeatureValueAction) Q_DECLARE_PRIVATE(QRemoveStructuralFeatureValueAction) @@ -86,7 +89,9 @@ protected: explicit QRemoveStructuralFeatureValueAction(QRemoveStructuralFeatureValueActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qremovestructuralfeaturevalueaction_p.h b/src/uml/qremovestructuralfeaturevalueaction_p.h index 81bfa85f..297d6956 100644 --- a/src/uml/qremovestructuralfeaturevalueaction_p.h +++ b/src/uml/qremovestructuralfeaturevalueaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *removeAt; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qremovevariablevalueaction.cpp b/src/uml/qremovevariablevalueaction.cpp index 897f0a4b..90571408 100644 --- a/src/uml/qremovevariablevalueaction.cpp +++ b/src/uml/qremovevariablevalueaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QRemoveVariableValueActionPrivate::QRemoveVariableValueActionPrivate() : isRemoveDuplicates(false), @@ -150,24 +153,26 @@ void QRemoveVariableValueAction::setRemoveAt(QInputPin *removeAt) void QRemoveVariableValueAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether to remove duplicates of the value in nonunique variables."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the position of an existing value to remove in ordered nonunique variables. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether to remove duplicates of the value in nonunique variables."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the position of an existing value to remove in ordered nonunique variables. The type of the pin is UnlimitedNatural, but the value cannot be zero or unlimited."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QRemoveVariableValueAction")][QString::fromLatin1("removeAt")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWriteVariableAction::setPropertyData(); } -#include "moc_qremovevariablevalueaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qremovevariablevalueaction.cpp" diff --git a/src/uml/qremovevariablevalueaction.h b/src/uml/qremovevariablevalueaction.h index 8edb4b24..3f5348db 100644 --- a/src/uml/qremovevariablevalueaction.h +++ b/src/uml/qremovevariablevalueaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QRemoveVariableValueAction : public QWriteVariableAction Q_OBJECT Q_PROPERTY(bool isRemoveDuplicates READ isRemoveDuplicates WRITE setRemoveDuplicates RESET unsetRemoveDuplicates) - Q_PROPERTY(QInputPin * removeAt READ removeAt WRITE setRemoveAt) + Q_PROPERTY(QtUml::QInputPin * removeAt READ removeAt WRITE setRemoveAt) Q_DISABLE_COPY(QRemoveVariableValueAction) Q_DECLARE_PRIVATE(QRemoveVariableValueAction) @@ -86,7 +89,9 @@ protected: explicit QRemoveVariableValueAction(QRemoveVariableValueActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qremovevariablevalueaction_p.h b/src/uml/qremovevariablevalueaction_p.h index c082dda8..7b0371fc 100644 --- a/src/uml/qremovevariablevalueaction_p.h +++ b/src/uml/qremovevariablevalueaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *removeAt; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreplyaction.cpp b/src/uml/qreplyaction.cpp index 921e8f0b..4d4cc456 100644 --- a/src/uml/qreplyaction.cpp +++ b/src/uml/qreplyaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QReplyActionPrivate::QReplyActionPrivate() : replyToCall(0), @@ -176,31 +179,33 @@ void QReplyAction::removeReplyValue(QInputPin *replyValue) void QReplyAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The trigger specifying the operation whose call is being replied to."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A pin containing the return information value produced by an earlier AcceptCallAction."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of pins containing the reply values of the operation. These values are returned to the caller."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The trigger specifying the operation whose call is being replied to."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A pin containing the return information value produced by an earlier AcceptCallAction."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of pins containing the reply values of the operation. These values are returned to the caller."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QReplyAction")][QString::fromLatin1("replyValues")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qreplyaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qreplyaction.cpp" diff --git a/src/uml/qreplyaction.h b/src/uml/qreplyaction.h index 448f7e3d..59c8f78f 100644 --- a/src/uml/qreplyaction.h +++ b/src/uml/qreplyaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,9 +68,9 @@ class Q_UML_EXPORT QReplyAction : public QAction { Q_OBJECT - Q_PROPERTY(QTrigger * replyToCall READ replyToCall WRITE setReplyToCall) - Q_PROPERTY(QInputPin * returnInformation READ returnInformation WRITE setReturnInformation) - Q_PROPERTY(QSet<QInputPin *> replyValues READ replyValues) + Q_PROPERTY(QtUml::QTrigger * replyToCall READ replyToCall WRITE setReplyToCall) + Q_PROPERTY(QtUml::QInputPin * returnInformation READ returnInformation WRITE setReturnInformation) + Q_PROPERTY(QSet<QtUml::QInputPin *> replyValues READ replyValues) Q_DISABLE_COPY(QReplyAction) Q_DECLARE_PRIVATE(QReplyAction) @@ -91,7 +94,9 @@ protected: explicit QReplyAction(QReplyActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qreplyaction_p.h b/src/uml/qreplyaction_p.h index 95ed55da..1c4e9f8a 100644 --- a/src/uml/qreplyaction_p.h +++ b/src/uml/qreplyaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QSet<QInputPin *> replyValues; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsendobjectaction.cpp b/src/uml/qsendobjectaction.cpp index e8c2523c..0fa8b2ad 100644 --- a/src/uml/qsendobjectaction.cpp +++ b/src/uml/qsendobjectaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QSendObjectActionPrivate::QSendObjectActionPrivate() : request(0), @@ -149,24 +152,26 @@ void QSendObjectAction::setTarget(QInputPin *target) void QSendObjectAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The request object, which is transmitted to the target object. The object may be copied in transmission, so identity might not be preserved."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInvocationAction::arguments"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The target object to which the object is sent."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The request object, which is transmitted to the target object. The object may be copied in transmission, so identity might not be preserved."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInvocationAction::arguments"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The target object to which the object is sent."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendObjectAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInvocationAction::setPropertyData(); } -#include "moc_qsendobjectaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qsendobjectaction.cpp" diff --git a/src/uml/qsendobjectaction.h b/src/uml/qsendobjectaction.h index aca90a29..dba482c3 100644 --- a/src/uml/qsendobjectaction.h +++ b/src/uml/qsendobjectaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QSendObjectAction : public QInvocationAction { Q_OBJECT - Q_PROPERTY(QInputPin * request READ request WRITE setRequest) - Q_PROPERTY(QInputPin * target READ target WRITE setTarget) + Q_PROPERTY(QtUml::QInputPin * request READ request WRITE setRequest) + Q_PROPERTY(QtUml::QInputPin * target READ target WRITE setTarget) Q_DISABLE_COPY(QSendObjectAction) Q_DECLARE_PRIVATE(QSendObjectAction) @@ -83,7 +86,9 @@ protected: explicit QSendObjectAction(QSendObjectActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsendobjectaction_p.h b/src/uml/qsendobjectaction_p.h index e1611bab..7373c29a 100644 --- a/src/uml/qsendobjectaction_p.h +++ b/src/uml/qsendobjectaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *target; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsendsignalaction.cpp b/src/uml/qsendsignalaction.cpp index 31d4b9f6..31113139 100644 --- a/src/uml/qsendsignalaction.cpp +++ b/src/uml/qsendsignalaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QSendSignalActionPrivate::QSendSignalActionPrivate() : target(0), @@ -139,24 +142,26 @@ void QSendSignalAction::setSignal(QSignal *signal) void QSendSignalAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The target object to which the signal is sent."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of signal transmitted to the target object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The target object to which the signal is sent."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of signal transmitted to the target object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSendSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInvocationAction::setPropertyData(); } -#include "moc_qsendsignalaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qsendsignalaction.cpp" diff --git a/src/uml/qsendsignalaction.h b/src/uml/qsendsignalaction.h index 24793fa4..06fad85d 100644 --- a/src/uml/qsendsignalaction.h +++ b/src/uml/qsendsignalaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QSendSignalAction : public QInvocationAction { Q_OBJECT - Q_PROPERTY(QInputPin * target READ target WRITE setTarget) - Q_PROPERTY(QSignal * signal READ signal WRITE setSignal) + Q_PROPERTY(QtUml::QInputPin * target READ target WRITE setTarget) + Q_PROPERTY(QtUml::QSignal * signal READ signal WRITE setSignal) Q_DISABLE_COPY(QSendSignalAction) Q_DECLARE_PRIVATE(QSendSignalAction) @@ -84,7 +87,9 @@ protected: explicit QSendSignalAction(QSendSignalActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsendsignalaction_p.h b/src/uml/qsendsignalaction_p.h index 7ebb8b96..71842ee6 100644 --- a/src/uml/qsendsignalaction_p.h +++ b/src/uml/qsendsignalaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QSignal *signal; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsequencenode.cpp b/src/uml/qsequencenode.cpp index 36fe3e9e..4fdfe029 100644 --- a/src/uml/qsequencenode.cpp +++ b/src/uml/qsequencenode.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QSequenceNodePrivate::QSequenceNodePrivate() { @@ -125,17 +128,19 @@ void QSequenceNode::removeExecutableNode(QExecutableNode *executableNode) void QSequenceNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An ordered set of executable nodes."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::nodes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An ordered set of executable nodes."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QStructuredActivityNode::nodes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QStructuredActivityNode::setPropertyData(); } -#include "moc_qsequencenode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qsequencenode.cpp" diff --git a/src/uml/qsequencenode.h b/src/uml/qsequencenode.h index 35eba6e4..cdf239b1 100644 --- a/src/uml/qsequencenode.h +++ b/src/uml/qsequencenode.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QSequenceNode : public QStructuredActivityNode { Q_OBJECT - Q_PROPERTY(QList<QExecutableNode *> executableNodes READ executableNodes) + Q_PROPERTY(QList<QtUml::QExecutableNode *> executableNodes READ executableNodes) Q_DISABLE_COPY(QSequenceNode) Q_DECLARE_PRIVATE(QSequenceNode) @@ -84,7 +87,9 @@ protected: explicit QSequenceNode(QSequenceNodePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsequencenode_p.h b/src/uml/qsequencenode_p.h index 05622db8..f0841b08 100644 --- a/src/uml/qsequencenode_p.h +++ b/src/uml/qsequencenode_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QList<QExecutableNode *> executableNodes; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsignal.cpp b/src/uml/qsignal.cpp index 65b94107..766f7ed6 100644 --- a/src/uml/qsignal.cpp +++ b/src/uml/qsignal.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QSignalPrivate::QSignalPrivate() { @@ -125,17 +128,19 @@ void QSignal::removeOwnedAttribute(QProperty *ownedAttribute) void QSignal::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes owned by the signal."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The attributes owned by the signal."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers QClassifier::attributes"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClassifier::setPropertyData(); } -#include "moc_qsignal.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qsignal.cpp" diff --git a/src/uml/qsignal.h b/src/uml/qsignal.h index afe68c27..5cd6a339 100644 --- a/src/uml/qsignal.h +++ b/src/uml/qsignal.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,7 +67,7 @@ class Q_UML_EXPORT QSignal : public QClassifier { Q_OBJECT - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QList<QtUml::QProperty *> ownedAttributes READ ownedAttributes) Q_DISABLE_COPY(QSignal) Q_DECLARE_PRIVATE(QSignal) @@ -84,7 +87,9 @@ protected: explicit QSignal(QSignalPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsignal_p.h b/src/uml/qsignal_p.h index 4944487b..ad2b5f7a 100644 --- a/src/uml/qsignal_p.h +++ b/src/uml/qsignal_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QList<QProperty *> ownedAttributes; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsignalevent.cpp b/src/uml/qsignalevent.cpp index 0c8ced58..91ea7700 100644 --- a/src/uml/qsignalevent.cpp +++ b/src/uml/qsignalevent.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QSignalEventPrivate::QSignalEventPrivate() : signal(0) @@ -108,17 +111,19 @@ void QSignalEvent::setSignal(QSignal *signal) void QSignalEvent::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specific signal that is associated with this event."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The specific signal that is associated with this event."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QMessageEvent::setPropertyData(); } -#include "moc_qsignalevent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qsignalevent.cpp" diff --git a/src/uml/qsignalevent.h b/src/uml/qsignalevent.h index aa657cbf..2957d0b1 100644 --- a/src/uml/qsignalevent.h +++ b/src/uml/qsignalevent.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QSignalEvent : public QMessageEvent { Q_OBJECT - Q_PROPERTY(QSignal * signal READ signal WRITE setSignal) + Q_PROPERTY(QtUml::QSignal * signal READ signal WRITE setSignal) Q_DISABLE_COPY(QSignalEvent) Q_DECLARE_PRIVATE(QSignalEvent) @@ -80,7 +83,9 @@ protected: explicit QSignalEvent(QSignalEventPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsignalevent_p.h b/src/uml/qsignalevent_p.h index a8dff2ed..7de0a8b5 100644 --- a/src/uml/qsignalevent_p.h +++ b/src/uml/qsignalevent_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QSignal *signal; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qslot.cpp b/src/uml/qslot.cpp index 8443cd2f..d81196f7 100644 --- a/src/uml/qslot.cpp +++ b/src/uml/qslot.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QSlotPrivate::QSlotPrivate() : definingFeature(0), @@ -180,31 +183,33 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance) void QSlot::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value or values corresponding to the defining feature for the owning instance specification."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The structural feature that specifies the values that may be held by the slot."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance specification that owns this slot."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInstanceSpecification::slot"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value or values corresponding to the defining feature for the owning instance specification."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("values")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The structural feature that specifies the values that may be held by the slot."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("definingFeature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The instance specification that owns this slot."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSlot")][QString::fromLatin1("owningInstance")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInstanceSpecification::slot"); QElement::setPropertyData(); } -#include "moc_qslot.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qslot.cpp" diff --git a/src/uml/qslot.h b/src/uml/qslot.h index 4bd0c39c..42732271 100644 --- a/src/uml/qslot.h +++ b/src/uml/qslot.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QSlot : public QElement { Q_OBJECT - Q_PROPERTY(QList<QValueSpecification *> values READ values) - Q_PROPERTY(QStructuralFeature * definingFeature READ definingFeature WRITE setDefiningFeature) - Q_PROPERTY(QInstanceSpecification * owningInstance READ owningInstance WRITE setOwningInstance) + Q_PROPERTY(QList<QtUml::QValueSpecification *> values READ values) + Q_PROPERTY(QtUml::QStructuralFeature * definingFeature READ definingFeature WRITE setDefiningFeature) + Q_PROPERTY(QtUml::QInstanceSpecification * owningInstance READ owningInstance WRITE setOwningInstance) Q_DISABLE_COPY(QSlot) Q_DECLARE_PRIVATE(QSlot) @@ -92,7 +95,9 @@ protected: explicit QSlot(QSlotPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qslot_p.h b/src/uml/qslot_p.h index 5e5aec92..48968614 100644 --- a/src/uml/qslot_p.h +++ b/src/uml/qslot_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QInstanceSpecification *owningInstance; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstartclassifierbehavioraction.cpp b/src/uml/qstartclassifierbehavioraction.cpp index b9e21ece..6db960ab 100644 --- a/src/uml/qstartclassifierbehavioraction.cpp +++ b/src/uml/qstartclassifierbehavioraction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStartClassifierBehaviorActionPrivate::QStartClassifierBehaviorActionPrivate() : object(0) @@ -116,17 +119,19 @@ void QStartClassifierBehaviorAction::setObject(QInputPin *object) void QStartClassifierBehaviorAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object on which to start the owned behavior."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object on which to start the owned behavior."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qstartclassifierbehavioraction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstartclassifierbehavioraction.cpp" diff --git a/src/uml/qstartclassifierbehavioraction.h b/src/uml/qstartclassifierbehavioraction.h index d6f69d7f..166bcd02 100644 --- a/src/uml/qstartclassifierbehavioraction.h +++ b/src/uml/qstartclassifierbehavioraction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QStartClassifierBehaviorAction : public QAction { Q_OBJECT - Q_PROPERTY(QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) Q_DISABLE_COPY(QStartClassifierBehaviorAction) Q_DECLARE_PRIVATE(QStartClassifierBehaviorAction) @@ -80,7 +83,9 @@ protected: explicit QStartClassifierBehaviorAction(QStartClassifierBehaviorActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstartclassifierbehavioraction_p.h b/src/uml/qstartclassifierbehavioraction_p.h index ce2337c1..1c8b3800 100644 --- a/src/uml/qstartclassifierbehavioraction_p.h +++ b/src/uml/qstartclassifierbehavioraction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QInputPin *object; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstartobjectbehavioraction.cpp b/src/uml/qstartobjectbehavioraction.cpp index 2af48851..0d8ad3e5 100644 --- a/src/uml/qstartobjectbehavioraction.cpp +++ b/src/uml/qstartobjectbehavioraction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStartObjectBehaviorActionPrivate::QStartObjectBehaviorActionPrivate() : object(0) @@ -116,17 +119,19 @@ void QStartObjectBehaviorAction::setObject(QInputPin *object) void QStartObjectBehaviorAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object which is either a behavior to be started or has a classifier behavior to be started."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Holds the object which is either a behavior to be started or has a classifier behavior to be started."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QCallAction::setPropertyData(); } -#include "moc_qstartobjectbehavioraction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstartobjectbehavioraction.cpp" diff --git a/src/uml/qstartobjectbehavioraction.h b/src/uml/qstartobjectbehavioraction.h index c24109b5..93e69c60 100644 --- a/src/uml/qstartobjectbehavioraction.h +++ b/src/uml/qstartobjectbehavioraction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QStartObjectBehaviorAction : public QCallAction { Q_OBJECT - Q_PROPERTY(QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) Q_DISABLE_COPY(QStartObjectBehaviorAction) Q_DECLARE_PRIVATE(QStartObjectBehaviorAction) @@ -80,7 +83,9 @@ protected: explicit QStartObjectBehaviorAction(QStartObjectBehaviorActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstartobjectbehavioraction_p.h b/src/uml/qstartobjectbehavioraction_p.h index e3e7c8cc..375cde1d 100644 --- a/src/uml/qstartobjectbehavioraction_p.h +++ b/src/uml/qstartobjectbehavioraction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QInputPin *object; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstate.cpp b/src/uml/qstate.cpp index 7fd8be4e..be74ba77 100644 --- a/src/uml/qstate.cpp +++ b/src/uml/qstate.cpp @@ -53,7 +53,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStatePrivate::QStatePrivate() : exit(0), @@ -157,12 +160,12 @@ void QState::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QState::visibility() const +QtUmlNS::VisibilityKind QState::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QState::setVisibility(QtUml::VisibilityKind visibility) +void QState::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -811,115 +814,117 @@ bool QState::isRedefinitionContextValid(const QState *redefined) const void QState::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isSimple=true is said to be a simple state. A simple state does not have any regions and it does not refer to any submachine state machine."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isComposite=true is said to be a composite state. A composite state is a state that contains at least one region."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isOrthogonal=true is said to be an orthogonal composite state. An orthogonal composite state contains two or more regions."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isSubmachineState=true is said to be a submachine state. Such a state refers to a state machine (submachine)."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("regions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("regions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("regions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The regions owned directly by the state."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("regions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("regions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("regions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::state"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("exit")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("exit")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("exit")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional behavior that is executed whenever this state is exited regardless of which transition was taken out of the state. If defined, exit actions are always executed to completion only after all internal activities and transition actions have completed execution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("exit")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("exit")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("exit")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connections")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connections")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connections")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The entry and exit connection points used in conjunction with this (submachine) state, i.e. as targets and sources, respectively, in the region with the submachine state. A connection point reference references the corresponding definition of a connection point pseudostate in the statemachine referenced by the submachinestate."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connections")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connections")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connections")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectionPointReference::state"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifier in which context this element may be redefined."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The state of which this state is a redefinition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of triggers that are candidates to be retained by the state machine if they trigger no transitions out of the state (not consumed). A deferred trigger is retained until the state machine reaches a state configuration where it is no longer deferred."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The entry and exit pseudostates of a composite state. These can only be entry or exit Pseudostates, and they must have different names. They can only be defined for composite states."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPseudostate::state"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("entry")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("entry")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("entry")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional behavior that is executed whenever this state is entered regardless of the transition taken to reach the state. If defined, entry actions are always executed to completion prior to any internal behavior or transitions performed within the state."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("entry")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("entry")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("entry")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional behavior that is executed while being in the state. The execution starts when this state is entered, and stops either by itself, or when the state is exited, whichever comes first."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("submachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("submachine")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("submachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The state machine that is to be inserted in place of the (submachine) state."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("submachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("submachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("submachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStateMachine::submachineState"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies conditions that are always true when this state is the current state. In protocol state machines, state invariants are additional conditions to the preconditions of the outgoing transitions, and to the postcondition of the incoming transitions."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isSimple=true is said to be a simple state. A simple state does not have any regions and it does not refer to any submachine state machine."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isComposite=true is said to be a composite state. A composite state is a state that contains at least one region."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isComposite")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isOrthogonal=true is said to be an orthogonal composite state. An orthogonal composite state contains two or more regions."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isOrthogonal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A state with isSubmachineState=true is said to be a submachine state. Such a state refers to a state machine (submachine)."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("isSubmachineState")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("regions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("regions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("regions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The regions owned directly by the state."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("regions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("regions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("regions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::state"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("exit")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("exit")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("exit")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional behavior that is executed whenever this state is exited regardless of which transition was taken out of the state. If defined, exit actions are always executed to completion only after all internal activities and transition actions have completed execution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("exit")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("exit")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("exit")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connections")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connections")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connections")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The entry and exit connection points used in conjunction with this (submachine) state, i.e. as targets and sources, respectively, in the region with the submachine state. A connection point reference references the corresponding definition of a connection point pseudostate in the statemachine referenced by the submachinestate."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connections")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connections")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connections")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QConnectionPointReference::state"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifier in which context this element may be redefined."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The state of which this state is a redefinition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("redefinedState")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A list of triggers that are candidates to be retained by the state machine if they trigger no transitions out of the state (not consumed). A deferred trigger is retained until the state machine reaches a state configuration where it is no longer deferred."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("deferrableTriggers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The entry and exit pseudostates of a composite state. These can only be entry or exit Pseudostates, and they must have different names. They can only be defined for composite states."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPseudostate::state"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("entry")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("entry")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("entry")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional behavior that is executed whenever this state is entered regardless of the transition taken to reach the state. If defined, entry actions are always executed to completion prior to any internal behavior or transitions performed within the state."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("entry")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("entry")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("entry")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An optional behavior that is executed while being in the state. The execution starts when this state is entered, and stops either by itself, or when the state is exited, whichever comes first."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("doActivity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("submachine")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("submachine")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("submachine")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The state machine that is to be inserted in place of the (submachine) state."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("submachine")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("submachine")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("submachine")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStateMachine::submachineState"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies conditions that are always true when this state is the current state. In protocol state machines, state invariants are additional conditions to the preconditions of the outgoing transitions, and to the postcondition of the incoming transitions."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QState")][QString::fromLatin1("stateInvariant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qstate.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstate.cpp" diff --git a/src/uml/qstate.h b/src/uml/qstate.h index 4f51999b..ca003f28 100644 --- a/src/uml/qstate.h +++ b/src/uml/qstate.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,46 +77,46 @@ class Q_UML_EXPORT QState : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QTransition *> incomings READ incomings STORED false) - Q_PROPERTY(QRegion * container READ container WRITE setContainer) - Q_PROPERTY(QSet<QTransition *> outgoings READ outgoings STORED false) + Q_PROPERTY(QSet<QtUml::QTransition *> incomings READ incomings STORED false) + Q_PROPERTY(QtUml::QRegion * container READ container WRITE setContainer) + Q_PROPERTY(QSet<QtUml::QTransition *> outgoings READ outgoings STORED false) Q_PROPERTY(bool isSimple READ isSimple STORED false) Q_PROPERTY(bool isComposite READ isComposite STORED false) Q_PROPERTY(bool isOrthogonal READ isOrthogonal STORED false) Q_PROPERTY(bool isSubmachineState READ isSubmachineState STORED false) - Q_PROPERTY(QSet<QRegion *> regions READ regions) - Q_PROPERTY(QBehavior * exit READ exit WRITE setExit) - Q_PROPERTY(QSet<QConnectionPointReference *> connections READ connections) - Q_PROPERTY(QClassifier * redefinitionContext READ redefinitionContext STORED false) - Q_PROPERTY(QState * redefinedState READ redefinedState WRITE setRedefinedState) - Q_PROPERTY(QSet<QTrigger *> deferrableTriggers READ deferrableTriggers) - Q_PROPERTY(QSet<QPseudostate *> connectionPoints READ connectionPoints) - Q_PROPERTY(QBehavior * entry READ entry WRITE setEntry) - Q_PROPERTY(QBehavior * doActivity READ doActivity WRITE setDoActivity) - Q_PROPERTY(QStateMachine * submachine READ submachine WRITE setSubmachine) - Q_PROPERTY(QConstraint * stateInvariant READ stateInvariant WRITE setStateInvariant) + Q_PROPERTY(QSet<QtUml::QRegion *> regions READ regions) + Q_PROPERTY(QtUml::QBehavior * exit READ exit WRITE setExit) + Q_PROPERTY(QSet<QtUml::QConnectionPointReference *> connections READ connections) + Q_PROPERTY(QtUml::QClassifier * redefinitionContext READ redefinitionContext STORED false) + Q_PROPERTY(QtUml::QState * redefinedState READ redefinedState WRITE setRedefinedState) + Q_PROPERTY(QSet<QtUml::QTrigger *> deferrableTriggers READ deferrableTriggers) + Q_PROPERTY(QSet<QtUml::QPseudostate *> connectionPoints READ connectionPoints) + Q_PROPERTY(QtUml::QBehavior * entry READ entry WRITE setEntry) + Q_PROPERTY(QtUml::QBehavior * doActivity READ doActivity WRITE setDoActivity) + Q_PROPERTY(QtUml::QStateMachine * submachine READ submachine WRITE setSubmachine) + Q_PROPERTY(QtUml::QConstraint * stateInvariant READ stateInvariant WRITE setStateInvariant) Q_DISABLE_COPY(QState) Q_DECLARE_PRIVATE(QState) @@ -132,8 +135,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -221,7 +224,9 @@ private: QVertex *_wrappedVertex; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstate_p.h b/src/uml/qstate_p.h index 9fec56e9..03872b63 100644 --- a/src/uml/qstate_p.h +++ b/src/uml/qstate_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -89,7 +92,9 @@ public: QConstraint *stateInvariant; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstateinvariant.cpp b/src/uml/qstateinvariant.cpp index a1992527..d66e89fd 100644 --- a/src/uml/qstateinvariant.cpp +++ b/src/uml/qstateinvariant.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStateInvariantPrivate::QStateInvariantPrivate() : invariant(0), @@ -147,24 +150,26 @@ void QStateInvariant::setCovered(QLifeline *covered) void QStateInvariant::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A Constraint that should hold at runtime for this StateInvariant"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Lifeline on which the StateInvariant appears."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInteractionFragment::covered"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A Constraint that should hold at runtime for this StateInvariant"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Lifeline on which the StateInvariant appears."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInteractionFragment::covered"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateInvariant")][QString::fromLatin1("covered")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInteractionFragment::setPropertyData(); } -#include "moc_qstateinvariant.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstateinvariant.cpp" diff --git a/src/uml/qstateinvariant.h b/src/uml/qstateinvariant.h index 430b2b11..03c41811 100644 --- a/src/uml/qstateinvariant.h +++ b/src/uml/qstateinvariant.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QStateInvariant : public QInteractionFragment { Q_OBJECT - Q_PROPERTY(QConstraint * invariant READ invariant WRITE setInvariant) - Q_PROPERTY(QLifeline * covered READ covered WRITE setCovered) + Q_PROPERTY(QtUml::QConstraint * invariant READ invariant WRITE setInvariant) + Q_PROPERTY(QtUml::QLifeline * covered READ covered WRITE setCovered) Q_DISABLE_COPY(QStateInvariant) Q_DECLARE_PRIVATE(QStateInvariant) @@ -84,7 +87,9 @@ protected: explicit QStateInvariant(QStateInvariantPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstateinvariant_p.h b/src/uml/qstateinvariant_p.h index 01cd6d91..3c837e76 100644 --- a/src/uml/qstateinvariant_p.h +++ b/src/uml/qstateinvariant_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QLifeline *covered; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstatemachine.cpp b/src/uml/qstatemachine.cpp index 2be42de7..30f38ee0 100644 --- a/src/uml/qstatemachine.cpp +++ b/src/uml/qstatemachine.cpp @@ -50,7 +50,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStateMachinePrivate::QStateMachinePrivate() { @@ -296,38 +299,40 @@ bool QStateMachine::isRedefinitionContextValid(const QStateMachine *redefined) c void QStateMachine::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The state machines of which this is an extension."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavior::redefinedBehaviors"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The connection points defined for this state machine. They represent the interface of the state machine when used as part of submachine state."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPseudostate::stateMachine"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the submachine(s) in case of a submachine state. Multiple machines are referenced in case of a concurrent state."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::submachine"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The regions owned directly by the state machine."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::stateMachine"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The state machines of which this is an extension."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QBehavior::redefinedBehaviors"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The connection points defined for this state machine. They represent the interface of the state machine when used as part of submachine state."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("connectionPoints")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPseudostate::stateMachine"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the submachine(s) in case of a submachine state. Multiple machines are referenced in case of a concurrent state."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("submachineStates")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QState::submachine"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The regions owned directly by the state machine."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStateMachine")][QString::fromLatin1("regions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::stateMachine"); QBehavior::setPropertyData(); } -#include "moc_qstatemachine.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstatemachine.cpp" diff --git a/src/uml/qstatemachine.h b/src/uml/qstatemachine.h index 875f7a99..e51cd8c0 100644 --- a/src/uml/qstatemachine.h +++ b/src/uml/qstatemachine.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,10 +71,10 @@ class Q_UML_EXPORT QStateMachine : public QBehavior { Q_OBJECT - Q_PROPERTY(QSet<QStateMachine *> extendedStateMachines READ extendedStateMachines) - Q_PROPERTY(QSet<QPseudostate *> connectionPoints READ connectionPoints) - Q_PROPERTY(QSet<QState *> submachineStates READ submachineStates) - Q_PROPERTY(QSet<QRegion *> regions READ regions) + Q_PROPERTY(QSet<QtUml::QStateMachine *> extendedStateMachines READ extendedStateMachines) + Q_PROPERTY(QSet<QtUml::QPseudostate *> connectionPoints READ connectionPoints) + Q_PROPERTY(QSet<QtUml::QState *> submachineStates READ submachineStates) + Q_PROPERTY(QSet<QtUml::QRegion *> regions READ regions) Q_DISABLE_COPY(QStateMachine) Q_DECLARE_PRIVATE(QStateMachine) @@ -106,7 +109,9 @@ protected: explicit QStateMachine(QStateMachinePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstatemachine_p.h b/src/uml/qstatemachine_p.h index 0bae5703..f766a217 100644 --- a/src/uml/qstatemachine_p.h +++ b/src/uml/qstatemachine_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ public: QSet<QRegion *> regions; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstereotype.cpp b/src/uml/qstereotype.cpp index f6ee5766..d32f0b40 100644 --- a/src/uml/qstereotype.cpp +++ b/src/uml/qstereotype.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStereotypePrivate::QStereotypePrivate() { @@ -146,24 +149,26 @@ QProfile *QStereotype::containingProfile() const void QStereotype::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Stereotype can change the graphical appearance of the extended model element by using attached icons. When this association is not null, it references the location of the icon content to be displayed within diagrams presenting the extended model elements."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The profile that directly or indirectly contains this stereotype."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Stereotype can change the graphical appearance of the extended model element by using attached icons. When this association is not null, it references the location of the icon content to be displayed within diagrams presenting the extended model elements."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The profile that directly or indirectly contains this stereotype."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStereotype")][QString::fromLatin1("profile")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClass::setPropertyData(); } -#include "moc_qstereotype.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstereotype.cpp" diff --git a/src/uml/qstereotype.h b/src/uml/qstereotype.h index 4eaa3abf..8a6f0213 100644 --- a/src/uml/qstereotype.h +++ b/src/uml/qstereotype.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QStereotype : public QClass { Q_OBJECT - Q_PROPERTY(QSet<QImage *> icons READ icons) - Q_PROPERTY(QProfile * profile READ profile STORED false) + Q_PROPERTY(QSet<QtUml::QImage *> icons READ icons) + Q_PROPERTY(QtUml::QProfile * profile READ profile STORED false) Q_DISABLE_COPY(QStereotype) Q_DECLARE_PRIVATE(QStereotype) @@ -90,7 +93,9 @@ protected: explicit QStereotype(QStereotypePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstereotype_p.h b/src/uml/qstereotype_p.h index 3efc46c4..820e058d 100644 --- a/src/uml/qstereotype_p.h +++ b/src/uml/qstereotype_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QSet<QImage *> icons; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstringexpression.cpp b/src/uml/qstringexpression.cpp index 1770b68b..4b0e646a 100644 --- a/src/uml/qstringexpression.cpp +++ b/src/uml/qstringexpression.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStringExpressionPrivate::QStringExpressionPrivate() : owningExpression(0) @@ -247,24 +250,26 @@ QString QStringExpression::stringValue() const void QStringExpression::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The string expression of which this expression is a substring."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStringExpression::subExpression"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The StringExpressions that constitute this StringExpression."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStringExpression::owningExpression"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The string expression of which this expression is a substring."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStringExpression::subExpression"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The StringExpressions that constitute this StringExpression."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStringExpression")][QString::fromLatin1("subExpressions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStringExpression::owningExpression"); QWrappedObject::setPropertyData(); } -#include "moc_qstringexpression.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstringexpression.cpp" diff --git a/src/uml/qstringexpression.h b/src/uml/qstringexpression.h index c9f73494..c2e3b1d5 100644 --- a/src/uml/qstringexpression.h +++ b/src/uml/qstringexpression.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,15 +67,15 @@ class Q_UML_EXPORT QStringExpression : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) - Q_PROPERTY(QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QtUml::QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) - Q_PROPERTY(QStringExpression * owningExpression READ owningExpression WRITE setOwningExpression) - Q_PROPERTY(QSet<QStringExpression *> subExpressions READ subExpressions) + Q_PROPERTY(QtUml::QStringExpression * owningExpression READ owningExpression WRITE setOwningExpression) + Q_PROPERTY(QSet<QtUml::QStringExpression *> subExpressions READ subExpressions) Q_DISABLE_COPY(QStringExpression) Q_DECLARE_PRIVATE(QStringExpression) @@ -115,7 +118,9 @@ private: QTemplateableElement *_wrappedTemplateableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstringexpression_p.h b/src/uml/qstringexpression_p.h index 4efc0dbb..f9b5d032 100644 --- a/src/uml/qstringexpression_p.h +++ b/src/uml/qstringexpression_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QSet<QStringExpression *> subExpressions; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuralfeature.cpp b/src/uml/qstructuralfeature.cpp index c751e2bf..a219cd3b 100644 --- a/src/uml/qstructuralfeature.cpp +++ b/src/uml/qstructuralfeature.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStructuralFeaturePrivate::QStructuralFeaturePrivate() : isReadOnly(false) @@ -143,12 +146,12 @@ void QStructuralFeature::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QStructuralFeature::visibility() const +QtUmlNS::VisibilityKind QStructuralFeature::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QStructuralFeature::setVisibility(QtUml::VisibilityKind visibility) +void QStructuralFeature::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -443,17 +446,19 @@ void QStructuralFeature::unsetReadOnly() void QStructuralFeature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("States whether the feature's value may be modified by a client."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("States whether the feature's value may be modified by a client."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qstructuralfeature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstructuralfeature.cpp" diff --git a/src/uml/qstructuralfeature.h b/src/uml/qstructuralfeature.h index 023c9741..2719dca0 100644 --- a/src/uml/qstructuralfeature.h +++ b/src/uml/qstructuralfeature.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,32 +64,32 @@ class Q_UML_EXPORT QStructuralFeature : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtUml::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtUml::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) Q_PROPERTY(bool isStatic READ isStatic WRITE setStatic RESET unsetStatic) - Q_PROPERTY(QSet<QClassifier *> featuringClassifiers READ featuringClassifiers) + Q_PROPERTY(QSet<QtUml::QClassifier *> featuringClassifiers READ featuringClassifiers) Q_PROPERTY(bool isReadOnly READ isReadOnly WRITE setReadOnly RESET unsetReadOnly) @@ -107,8 +110,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -175,7 +178,9 @@ private: QFeature *_wrappedFeature; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuralfeature_p.h b/src/uml/qstructuralfeature_p.h index 1d93db84..d01f4249 100644 --- a/src/uml/qstructuralfeature_p.h +++ b/src/uml/qstructuralfeature_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,7 +69,9 @@ public: bool isReadOnly; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuralfeatureaction.cpp b/src/uml/qstructuralfeatureaction.cpp index dd7c1f4c..fb76203a 100644 --- a/src/uml/qstructuralfeatureaction.cpp +++ b/src/uml/qstructuralfeatureaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStructuralFeatureActionPrivate::QStructuralFeatureActionPrivate() : object(0), @@ -139,24 +142,26 @@ void QStructuralFeatureAction::setStructuralFeature(QStructuralFeature *structur void QStructuralFeatureAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which the object whose structural feature is to be read or written is obtained."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Structural feature to be read."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the input pin from which the object whose structural feature is to be read or written is obtained."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Structural feature to be read."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuralFeatureAction")][QString::fromLatin1("structuralFeature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qstructuralfeatureaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstructuralfeatureaction.cpp" diff --git a/src/uml/qstructuralfeatureaction.h b/src/uml/qstructuralfeatureaction.h index ff38c18b..80763253 100644 --- a/src/uml/qstructuralfeatureaction.h +++ b/src/uml/qstructuralfeatureaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QStructuralFeatureAction : public QAction { Q_OBJECT - Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(QStructuralFeature * structuralFeature READ structuralFeature WRITE setStructuralFeature) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QtUml::QStructuralFeature * structuralFeature READ structuralFeature WRITE setStructuralFeature) Q_DISABLE_COPY(QStructuralFeatureAction) Q_DECLARE_PRIVATE(QStructuralFeatureAction) @@ -84,7 +87,9 @@ protected: explicit QStructuralFeatureAction(QStructuralFeatureActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuralfeatureaction_p.h b/src/uml/qstructuralfeatureaction_p.h index 0a747340..a01eb25e 100644 --- a/src/uml/qstructuralfeatureaction_p.h +++ b/src/uml/qstructuralfeatureaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QStructuralFeature *structuralFeature; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuredactivitynode.cpp b/src/uml/qstructuredactivitynode.cpp index 40f1ac4e..63c1b8e3 100644 --- a/src/uml/qstructuredactivitynode.cpp +++ b/src/uml/qstructuredactivitynode.cpp @@ -51,7 +51,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStructuredActivityNodePrivate::QStructuredActivityNodePrivate() : mustIsolate(false), @@ -151,12 +154,12 @@ void QStructuredActivityNode::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QStructuredActivityNode::visibility() const +QtUmlNS::VisibilityKind QStructuredActivityNode::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QStructuredActivityNode::setVisibility(QtUml::VisibilityKind visibility) +void QStructuredActivityNode::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -872,59 +875,61 @@ void QStructuredActivityNode::setActivity(QActivity *activity) void QStructuredActivityNode::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, then the actions in the node execute in isolation from actions outside the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedNodes QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inStructuredNode"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges immediately contained in the structured node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedEdges QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::inStructuredNode"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A variable defined in the scope of the structured activity node. It has no value and may not be accessed"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVariable::scope"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity immediately containing the node."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QActivityGroup::inActivity QActivityNode::activity"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::structuredNode"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("If true, then the actions in the node execute in isolation from actions outside the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeInputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Nodes immediately contained in the group."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedNodes QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("nodes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityNode::inStructuredNode"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("structuredNodeOutputs")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Edges immediately contained in the structured node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QActivityGroup::containedEdges QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("edges")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivityEdge::inStructuredNode"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A variable defined in the scope of the structured activity node. It has no value and may not be accessed"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("variables")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVariable::scope"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Activity immediately containing the node."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QActivityGroup::inActivity QActivityNode::activity"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredActivityNode")][QString::fromLatin1("activity")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::structuredNode"); QWrappedObject::setPropertyData(); } -#include "moc_qstructuredactivitynode.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstructuredactivitynode.cpp" diff --git a/src/uml/qstructuredactivitynode.h b/src/uml/qstructuredactivitynode.h index 9066f41e..32b93a87 100644 --- a/src/uml/qstructuredactivitynode.h +++ b/src/uml/qstructuredactivitynode.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,57 +75,57 @@ class Q_UML_EXPORT QStructuredActivityNode : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - Q_PROPERTY(QSet<QClassifier *> redefinitionContexts READ redefinitionContexts) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + Q_PROPERTY(QSet<QtUml::QClassifier *> redefinitionContexts READ redefinitionContexts) - Q_PROPERTY(QSet<QActivityNode *> redefinedNodes READ redefinedNodes) - Q_PROPERTY(QSet<QActivityEdge *> incomings READ incomings) - Q_PROPERTY(QSet<QActivityGroup *> inGroup READ inGroup) - Q_PROPERTY(QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) - Q_PROPERTY(QSet<QActivityPartition *> inPartition READ inPartition) - Q_PROPERTY(QSet<QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) - Q_PROPERTY(QSet<QActivityEdge *> outgoings READ outgoings) + Q_PROPERTY(QSet<QtUml::QActivityNode *> redefinedNodes READ redefinedNodes) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> incomings READ incomings) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> inGroup READ inGroup) + Q_PROPERTY(QtUml::QStructuredActivityNode * inStructuredNode READ inStructuredNode WRITE setInStructuredNode) + Q_PROPERTY(QSet<QtUml::QActivityPartition *> inPartition READ inPartition) + Q_PROPERTY(QSet<QtUml::QInterruptibleActivityRegion *> inInterruptibleRegion READ inInterruptibleRegion) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> outgoings READ outgoings) - Q_PROPERTY(QSet<QExceptionHandler *> handlers READ handlers) + Q_PROPERTY(QSet<QtUml::QExceptionHandler *> handlers READ handlers) Q_PROPERTY(bool isLocallyReentrant READ isLocallyReentrant WRITE setLocallyReentrant RESET unsetLocallyReentrant) - Q_PROPERTY(QClassifier * context READ context STORED false) - Q_PROPERTY(QSet<QConstraint *> localPostconditions READ localPostconditions) - Q_PROPERTY(QSet<QConstraint *> localPreconditions READ localPreconditions) - Q_PROPERTY(QList<QInputPin *> inputs READ inputs) - Q_PROPERTY(QList<QOutputPin *> outputs READ outputs) - - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) - - Q_PROPERTY(QSet<QActivityNode *> containedNodes READ containedNodes) - Q_PROPERTY(QSet<QActivityGroup *> subgroups READ subgroups) - Q_PROPERTY(QSet<QActivityEdge *> containedEdges READ containedEdges) - Q_PROPERTY(QActivityGroup * superGroup READ superGroup) + Q_PROPERTY(QtUml::QClassifier * context READ context STORED false) + Q_PROPERTY(QSet<QtUml::QConstraint *> localPostconditions READ localPostconditions) + Q_PROPERTY(QSet<QtUml::QConstraint *> localPreconditions READ localPreconditions) + Q_PROPERTY(QList<QtUml::QInputPin *> inputs READ inputs) + Q_PROPERTY(QList<QtUml::QOutputPin *> outputs READ outputs) + + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) + + Q_PROPERTY(QSet<QtUml::QActivityNode *> containedNodes READ containedNodes) + Q_PROPERTY(QSet<QtUml::QActivityGroup *> subgroups READ subgroups) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> containedEdges READ containedEdges) + Q_PROPERTY(QtUml::QActivityGroup * superGroup READ superGroup) Q_PROPERTY(bool mustIsolate READ mustIsolate WRITE setMustIsolate RESET unsetMustIsolate) - Q_PROPERTY(QSet<QInputPin *> structuredNodeInputs READ structuredNodeInputs) - Q_PROPERTY(QSet<QActivityNode *> nodes READ nodes) - Q_PROPERTY(QSet<QOutputPin *> structuredNodeOutputs READ structuredNodeOutputs) - Q_PROPERTY(QSet<QActivityEdge *> edges READ edges) - Q_PROPERTY(QSet<QVariable *> variables READ variables) - Q_PROPERTY(QActivity * activity READ activity WRITE setActivity) + Q_PROPERTY(QSet<QtUml::QInputPin *> structuredNodeInputs READ structuredNodeInputs) + Q_PROPERTY(QSet<QtUml::QActivityNode *> nodes READ nodes) + Q_PROPERTY(QSet<QtUml::QOutputPin *> structuredNodeOutputs READ structuredNodeOutputs) + Q_PROPERTY(QSet<QtUml::QActivityEdge *> edges READ edges) + Q_PROPERTY(QSet<QtUml::QVariable *> variables READ variables) + Q_PROPERTY(QtUml::QActivity * activity READ activity WRITE setActivity) Q_DISABLE_COPY(QStructuredActivityNode) Q_DECLARE_PRIVATE(QStructuredActivityNode) @@ -141,8 +144,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -258,7 +261,9 @@ private: QActivityGroup *_wrappedActivityGroup; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuredactivitynode_p.h b/src/uml/qstructuredactivitynode_p.h index 2486fcbb..3e29602f 100644 --- a/src/uml/qstructuredactivitynode_p.h +++ b/src/uml/qstructuredactivitynode_p.h @@ -54,7 +54,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -84,7 +87,9 @@ public: QActivity *activity; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuredclassifier.cpp b/src/uml/qstructuredclassifier.cpp index 5cfad4ac..660aee5e 100644 --- a/src/uml/qstructuredclassifier.cpp +++ b/src/uml/qstructuredclassifier.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QStructuredClassifierPrivate::QStructuredClassifierPrivate() { @@ -215,38 +218,40 @@ void QStructuredClassifier::removeOwnedConnector(QConnector *ownedConnector) void QStructuredClassifier::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::IsDerivedUnionRole] = true; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the roles that instances may play in this classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties owned by the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::attributes QNamespace::ownedMembers QStructuredClassifier::roles"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties specifying instances that the classifier owns by composition. This association is derived, selecting those owned properties where isComposite is true."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the connectors owned by the classifier."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::IsDerivedUnionRole] = true; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the roles that instances may play in this classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::members"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties owned by the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::attributes QNamespace::ownedMembers QStructuredClassifier::roles"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the properties specifying instances that the classifier owns by composition. This association is derived, selecting those owned properties where isComposite is true."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("parts")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the connectors owned by the classifier."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QClassifier::features QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QStructuredClassifier")][QString::fromLatin1("ownedConnectors")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QClassifier::setPropertyData(); } -#include "moc_qstructuredclassifier.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qstructuredclassifier.cpp" diff --git a/src/uml/qstructuredclassifier.h b/src/uml/qstructuredclassifier.h index a9881ce1..0bf4659e 100644 --- a/src/uml/qstructuredclassifier.h +++ b/src/uml/qstructuredclassifier.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,10 +70,10 @@ class Q_UML_EXPORT QStructuredClassifier : public QClassifier { Q_OBJECT - Q_PROPERTY(QSet<QConnectableElement *> roles READ roles) - Q_PROPERTY(QList<QProperty *> ownedAttributes READ ownedAttributes) - Q_PROPERTY(QSet<QProperty *> parts READ parts STORED false) - Q_PROPERTY(QSet<QConnector *> ownedConnectors READ ownedConnectors) + Q_PROPERTY(QSet<QtUml::QConnectableElement *> roles READ roles) + Q_PROPERTY(QList<QtUml::QProperty *> ownedAttributes READ ownedAttributes) + Q_PROPERTY(QSet<QtUml::QProperty *> parts READ parts STORED false) + Q_PROPERTY(QSet<QtUml::QConnector *> ownedConnectors READ ownedConnectors) Q_DISABLE_COPY(QStructuredClassifier) Q_DECLARE_PRIVATE(QStructuredClassifier) @@ -95,7 +98,9 @@ protected: explicit QStructuredClassifier(QStructuredClassifierPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qstructuredclassifier_p.h b/src/uml/qstructuredclassifier_p.h index 8c532311..7fc4f5e5 100644 --- a/src/uml/qstructuredclassifier_p.h +++ b/src/uml/qstructuredclassifier_p.h @@ -52,7 +52,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -78,7 +81,9 @@ public: void removeRole(QConnectableElement *role); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsubstitution.cpp b/src/uml/qsubstitution.cpp index 1b2d66da..1fda747c 100644 --- a/src/uml/qsubstitution.cpp +++ b/src/uml/qsubstitution.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QSubstitutionPrivate::QSubstitutionPrivate() : contract(0), @@ -155,19 +158,19 @@ void QSubstitution::setSubstitutingClassifier(QClassifier *substitutingClassifie void QSubstitution::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The contract with which the substituting classifier complies."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDependency::clients"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::substitution"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The contract with which the substituting classifier complies."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDependency::suppliers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Instances of the substituting classifier are runtime substitutable where instances of the contract classifier are expected."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDependency::clients"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QSubstitution")][QString::fromLatin1("substitutingClassifier")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::substitution"); QRealization::setPropertyData(); } @@ -196,7 +199,9 @@ void QSubstitution::removeClient(QWrappedObjectPointer<QClassifier> substituting setSubstitutingClassifier(0); } -#include "moc_qsubstitution.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qsubstitution.cpp" diff --git a/src/uml/qsubstitution.h b/src/uml/qsubstitution.h index 0ce3e451..76570503 100644 --- a/src/uml/qsubstitution.h +++ b/src/uml/qsubstitution.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,8 +66,8 @@ class Q_UML_EXPORT QSubstitution : public QRealization { Q_OBJECT - Q_PROPERTY(QClassifier * contract READ contract WRITE setContract) - Q_PROPERTY(QClassifier * substitutingClassifier READ substitutingClassifier WRITE setSubstitutingClassifier) + Q_PROPERTY(QtUml::QClassifier * contract READ contract WRITE setContract) + Q_PROPERTY(QtUml::QClassifier * substitutingClassifier READ substitutingClassifier WRITE setSubstitutingClassifier) Q_DISABLE_COPY(QSubstitution) Q_DECLARE_PRIVATE(QSubstitution) @@ -91,7 +94,9 @@ protected: explicit QSubstitution(QSubstitutionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qsubstitution_p.h b/src/uml/qsubstitution_p.h index 6f525a26..18605328 100644 --- a/src/uml/qsubstitution_p.h +++ b/src/uml/qsubstitution_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QClassifier *substitutingClassifier; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplateableelement.cpp b/src/uml/qtemplateableelement.cpp index 74e1e06c..fc76809c 100644 --- a/src/uml/qtemplateableelement.cpp +++ b/src/uml/qtemplateableelement.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTemplateableElementPrivate::QTemplateableElementPrivate() : ownedTemplateSignature(0) @@ -186,24 +189,26 @@ QSet<QParameterableElement *> QTemplateableElement::parameterableElements() cons void QTemplateableElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional template signature specifying the formal template parameters."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateSignature::template"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional bindings from this element to templates."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateBinding::boundElement"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional template signature specifying the formal template parameters."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateSignature::template"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional bindings from this element to templates."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateableElement")][QString::fromLatin1("templateBindings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateBinding::boundElement"); QElement::setPropertyData(); } -#include "moc_qtemplateableelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtemplateableelement.cpp" diff --git a/src/uml/qtemplateableelement.h b/src/uml/qtemplateableelement.h index 63c67692..5881f58f 100644 --- a/src/uml/qtemplateableelement.h +++ b/src/uml/qtemplateableelement.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,8 +69,8 @@ class Q_UML_EXPORT QTemplateableElement : public QElement { Q_OBJECT - Q_PROPERTY(QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) - Q_PROPERTY(QSet<QTemplateBinding *> templateBindings READ templateBindings) + Q_PROPERTY(QtUml::QTemplateSignature * ownedTemplateSignature READ ownedTemplateSignature WRITE setOwnedTemplateSignature) + Q_PROPERTY(QSet<QtUml::QTemplateBinding *> templateBindings READ templateBindings) Q_DISABLE_COPY(QTemplateableElement) Q_DECLARE_PRIVATE(QTemplateableElement) @@ -93,7 +96,9 @@ protected: explicit QTemplateableElement(QTemplateableElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplateableelement_p.h b/src/uml/qtemplateableelement_p.h index a532d7e2..401e73a5 100644 --- a/src/uml/qtemplateableelement_p.h +++ b/src/uml/qtemplateableelement_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QSet<QTemplateBinding *> templateBindings; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplatebinding.cpp b/src/uml/qtemplatebinding.cpp index 6306d7a6..a32de61d 100644 --- a/src/uml/qtemplatebinding.cpp +++ b/src/uml/qtemplatebinding.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTemplateBindingPrivate::QTemplateBindingPrivate() : signature(0), @@ -200,31 +203,33 @@ void QTemplateBinding::removeParameterSubstitution(QTemplateParameterSubstitutio void QTemplateBinding::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template signature for the template that is the target of the binding."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is bound by this binding."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateableElement::templateBinding"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameter substitutions owned by this template binding."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameterSubstitution::templateBinding"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template signature for the template that is the target of the binding."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QDirectedRelationship::targets"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is bound by this binding."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner QDirectedRelationship::sources"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("boundElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateableElement::templateBinding"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The parameter substitutions owned by this template binding."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateBinding")][QString::fromLatin1("parameterSubstitutions")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameterSubstitution::templateBinding"); QDirectedRelationship::setPropertyData(); } -#include "moc_qtemplatebinding.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtemplatebinding.cpp" diff --git a/src/uml/qtemplatebinding.h b/src/uml/qtemplatebinding.h index c2c17212..939ab309 100644 --- a/src/uml/qtemplatebinding.h +++ b/src/uml/qtemplatebinding.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QTemplateBinding : public QDirectedRelationship { Q_OBJECT - Q_PROPERTY(QTemplateSignature * signature READ signature WRITE setSignature) - Q_PROPERTY(QTemplateableElement * boundElement READ boundElement WRITE setBoundElement) - Q_PROPERTY(QSet<QTemplateParameterSubstitution *> parameterSubstitutions READ parameterSubstitutions) + Q_PROPERTY(QtUml::QTemplateSignature * signature READ signature WRITE setSignature) + Q_PROPERTY(QtUml::QTemplateableElement * boundElement READ boundElement WRITE setBoundElement) + Q_PROPERTY(QSet<QtUml::QTemplateParameterSubstitution *> parameterSubstitutions READ parameterSubstitutions) Q_DISABLE_COPY(QTemplateBinding) Q_DECLARE_PRIVATE(QTemplateBinding) @@ -92,7 +95,9 @@ protected: explicit QTemplateBinding(QTemplateBindingPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplatebinding_p.h b/src/uml/qtemplatebinding_p.h index 2c1ef0ae..ef6a1c7e 100644 --- a/src/uml/qtemplatebinding_p.h +++ b/src/uml/qtemplatebinding_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QSet<QTemplateParameterSubstitution *> parameterSubstitutions; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplateparameter.cpp b/src/uml/qtemplateparameter.cpp index 456cc2af..39e11a21 100644 --- a/src/uml/qtemplateparameter.cpp +++ b/src/uml/qtemplateparameter.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTemplateParameterPrivate::QTemplateParameterPrivate() : default_(0), @@ -236,45 +239,47 @@ void QTemplateParameter::setSignature(QTemplateSignature *signature) void QTemplateParameter::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is the default for this formal template parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element exposed by this template parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameterableElement::templateParameter"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is owned by this template parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameterableElement::owningTemplateParameter"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is owned by this template parameter for the purpose of providing a default."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QTemplateParameter::default"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template signature that owns this template parameter."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateSignature::ownedParameter"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is the default for this formal template parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element exposed by this template parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameterableElement::templateParameter"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is owned by this template parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTemplateParameter::parameteredElement QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedParameteredElement")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QParameterableElement::owningTemplateParameter"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is owned by this template parameter for the purpose of providing a default."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QTemplateParameter::default"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("ownedDefault")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The template signature that owns this template parameter."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameter")][QString::fromLatin1("signature")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateSignature::ownedParameter"); QElement::setPropertyData(); } -#include "moc_qtemplateparameter.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtemplateparameter.cpp" diff --git a/src/uml/qtemplateparameter.h b/src/uml/qtemplateparameter.h index c7eb1859..51ef4ca3 100644 --- a/src/uml/qtemplateparameter.h +++ b/src/uml/qtemplateparameter.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,11 +65,11 @@ class Q_UML_EXPORT QTemplateParameter : public QElement { Q_OBJECT - Q_PROPERTY(QParameterableElement * default_ READ default_ WRITE setDefault_) - Q_PROPERTY(QParameterableElement * parameteredElement READ parameteredElement WRITE setParameteredElement) - Q_PROPERTY(QParameterableElement * ownedParameteredElement READ ownedParameteredElement WRITE setOwnedParameteredElement) - Q_PROPERTY(QParameterableElement * ownedDefault READ ownedDefault WRITE setOwnedDefault) - Q_PROPERTY(QTemplateSignature * signature READ signature WRITE setSignature) + Q_PROPERTY(QtUml::QParameterableElement * default_ READ default_ WRITE setDefault_) + Q_PROPERTY(QtUml::QParameterableElement * parameteredElement READ parameteredElement WRITE setParameteredElement) + Q_PROPERTY(QtUml::QParameterableElement * ownedParameteredElement READ ownedParameteredElement WRITE setOwnedParameteredElement) + Q_PROPERTY(QtUml::QParameterableElement * ownedDefault READ ownedDefault WRITE setOwnedDefault) + Q_PROPERTY(QtUml::QTemplateSignature * signature READ signature WRITE setSignature) Q_DISABLE_COPY(QTemplateParameter) Q_DECLARE_PRIVATE(QTemplateParameter) @@ -93,7 +96,9 @@ protected: explicit QTemplateParameter(QTemplateParameterPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplateparameter_p.h b/src/uml/qtemplateparameter_p.h index d64ee611..95401ce7 100644 --- a/src/uml/qtemplateparameter_p.h +++ b/src/uml/qtemplateparameter_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QTemplateSignature *signature; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplateparametersubstitution.cpp b/src/uml/qtemplateparametersubstitution.cpp index 2ec86c86..cd409363 100644 --- a/src/uml/qtemplateparametersubstitution.cpp +++ b/src/uml/qtemplateparametersubstitution.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTemplateParameterSubstitutionPrivate::QTemplateParameterSubstitutionPrivate() : ownedActual(0), @@ -196,38 +199,40 @@ void QTemplateParameterSubstitution::setTemplateBinding(QTemplateBinding *templa void QTemplateParameterSubstitution::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The actual parameter that is owned by this substitution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QTemplateParameterSubstitution::actual"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameter that is associated with this substitution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is the actual parameter for this substitution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional bindings from this element to templates."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateBinding::parameterSubstitution"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The actual parameter that is owned by this substitution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements QTemplateParameterSubstitution::actual"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameter that is associated with this substitution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("formal")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that is the actual parameter for this substitution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("actual")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The optional bindings from this element to templates."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateParameterSubstitution")][QString::fromLatin1("templateBinding")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateBinding::parameterSubstitution"); QElement::setPropertyData(); } -#include "moc_qtemplateparametersubstitution.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtemplateparametersubstitution.cpp" diff --git a/src/uml/qtemplateparametersubstitution.h b/src/uml/qtemplateparametersubstitution.h index 279dfa25..04734490 100644 --- a/src/uml/qtemplateparametersubstitution.h +++ b/src/uml/qtemplateparametersubstitution.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -63,10 +66,10 @@ class Q_UML_EXPORT QTemplateParameterSubstitution : public QElement { Q_OBJECT - Q_PROPERTY(QParameterableElement * ownedActual READ ownedActual WRITE setOwnedActual) - Q_PROPERTY(QTemplateParameter * formal READ formal WRITE setFormal) - Q_PROPERTY(QParameterableElement * actual READ actual WRITE setActual) - Q_PROPERTY(QTemplateBinding * templateBinding READ templateBinding WRITE setTemplateBinding) + Q_PROPERTY(QtUml::QParameterableElement * ownedActual READ ownedActual WRITE setOwnedActual) + Q_PROPERTY(QtUml::QTemplateParameter * formal READ formal WRITE setFormal) + Q_PROPERTY(QtUml::QParameterableElement * actual READ actual WRITE setActual) + Q_PROPERTY(QtUml::QTemplateBinding * templateBinding READ templateBinding WRITE setTemplateBinding) Q_DISABLE_COPY(QTemplateParameterSubstitution) Q_DECLARE_PRIVATE(QTemplateParameterSubstitution) @@ -91,7 +94,9 @@ protected: explicit QTemplateParameterSubstitution(QTemplateParameterSubstitutionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplateparametersubstitution_p.h b/src/uml/qtemplateparametersubstitution_p.h index 60c0dcef..3523c472 100644 --- a/src/uml/qtemplateparametersubstitution_p.h +++ b/src/uml/qtemplateparametersubstitution_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QTemplateBinding *templateBinding; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplatesignature.cpp b/src/uml/qtemplatesignature.cpp index f6c613bb..c3840bd7 100644 --- a/src/uml/qtemplatesignature.cpp +++ b/src/uml/qtemplatesignature.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTemplateSignaturePrivate::QTemplateSignaturePrivate() : template_(0) @@ -193,31 +196,33 @@ void QTemplateSignature::removeOwnedParameter(QTemplateParameter *ownedParameter void QTemplateSignature::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of all formal template parameters for this template signature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that owns this template signature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateableElement::ownedTemplateSignature"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameters that are owned by this template signature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTemplateSignature::parameters QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameter::signature"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The ordered set of all formal template parameters for this template signature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The element that owns this template signature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::owner"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("template_")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateableElement::ownedTemplateSignature"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The formal template parameters that are owned by this template signature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QTemplateSignature::parameters QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTemplateSignature")][QString::fromLatin1("ownedParameters")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTemplateParameter::signature"); QElement::setPropertyData(); } -#include "moc_qtemplatesignature.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtemplatesignature.cpp" diff --git a/src/uml/qtemplatesignature.h b/src/uml/qtemplatesignature.h index 3dd76bfb..c1551865 100644 --- a/src/uml/qtemplatesignature.h +++ b/src/uml/qtemplatesignature.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,9 +68,9 @@ class Q_UML_EXPORT QTemplateSignature : public QElement { Q_OBJECT - Q_PROPERTY(QList<QTemplateParameter *> parameters READ parameters) - Q_PROPERTY(QTemplateableElement * template_ READ template_ WRITE setTemplate_) - Q_PROPERTY(QList<QTemplateParameter *> ownedParameters READ ownedParameters) + Q_PROPERTY(QList<QtUml::QTemplateParameter *> parameters READ parameters) + Q_PROPERTY(QtUml::QTemplateableElement * template_ READ template_ WRITE setTemplate_) + Q_PROPERTY(QList<QtUml::QTemplateParameter *> ownedParameters READ ownedParameters) Q_DISABLE_COPY(QTemplateSignature) Q_DECLARE_PRIVATE(QTemplateSignature) @@ -92,7 +95,9 @@ protected: explicit QTemplateSignature(QTemplateSignaturePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtemplatesignature_p.h b/src/uml/qtemplatesignature_p.h index 2d88303c..2fc2387b 100644 --- a/src/uml/qtemplatesignature_p.h +++ b/src/uml/qtemplatesignature_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -73,7 +76,9 @@ public: QList<QTemplateParameter *> ownedParameters; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtestidentityaction.cpp b/src/uml/qtestidentityaction.cpp index 5cf98a1f..437aa821 100644 --- a/src/uml/qtestidentityaction.cpp +++ b/src/uml/qtestidentityaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTestIdentityActionPrivate::QTestIdentityActionPrivate() : second(0), @@ -177,31 +180,33 @@ void QTestIdentityAction::setFirst(QInputPin *first) void QTestIdentityAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the pin on which an object is placed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the two input objects are identical."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the pin on which an object is placed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the pin on which an object is placed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Tells whether the two input objects are identical."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the pin on which an object is placed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTestIdentityAction")][QString::fromLatin1("first")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qtestidentityaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtestidentityaction.cpp" diff --git a/src/uml/qtestidentityaction.h b/src/uml/qtestidentityaction.h index 49013fe0..d296196b 100644 --- a/src/uml/qtestidentityaction.h +++ b/src/uml/qtestidentityaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,9 +65,9 @@ class Q_UML_EXPORT QTestIdentityAction : public QAction { Q_OBJECT - Q_PROPERTY(QInputPin * second READ second WRITE setSecond) - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) - Q_PROPERTY(QInputPin * first READ first WRITE setFirst) + Q_PROPERTY(QtUml::QInputPin * second READ second WRITE setSecond) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QInputPin * first READ first WRITE setFirst) Q_DISABLE_COPY(QTestIdentityAction) Q_DECLARE_PRIVATE(QTestIdentityAction) @@ -87,7 +90,9 @@ protected: explicit QTestIdentityAction(QTestIdentityActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtestidentityaction_p.h b/src/uml/qtestidentityaction_p.h index c77323b9..76d658df 100644 --- a/src/uml/qtestidentityaction_p.h +++ b/src/uml/qtestidentityaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: QInputPin *first; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeconstraint.cpp b/src/uml/qtimeconstraint.cpp index 0561e68e..79b90c3e 100644 --- a/src/uml/qtimeconstraint.cpp +++ b/src/uml/qtimeconstraint.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTimeConstraintPrivate::QTimeConstraintPrivate() : firstEvent(true), @@ -148,24 +151,26 @@ void QTimeConstraint::setSpecification(QTimeInterval *specification) void QTimeConstraint::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent is related to constrainedElement. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters constrainedElement. If firstEvent is false, then the corresponding observation event is the last time instant the execution is within constrainedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QIntervalConstraint::specification"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent is related to constrainedElement. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters constrainedElement. If firstEvent is false, then the corresponding observation event is the last time instant the execution is within constrainedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A condition that must be true when evaluated in order for the constraint to be satisfied."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QIntervalConstraint::specification"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QIntervalConstraint::setPropertyData(); } -#include "moc_qtimeconstraint.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtimeconstraint.cpp" diff --git a/src/uml/qtimeconstraint.h b/src/uml/qtimeconstraint.h index d434cf42..3ecbe38f 100644 --- a/src/uml/qtimeconstraint.h +++ b/src/uml/qtimeconstraint.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QTimeConstraint : public QIntervalConstraint Q_OBJECT Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent RESET unsetFirstEvent) - Q_PROPERTY(QTimeInterval * specification READ specification WRITE setSpecification) + Q_PROPERTY(QtUml::QTimeInterval * specification READ specification WRITE setSpecification) Q_DISABLE_COPY(QTimeConstraint) Q_DECLARE_PRIVATE(QTimeConstraint) @@ -86,7 +89,9 @@ protected: explicit QTimeConstraint(QTimeConstraintPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeconstraint_p.h b/src/uml/qtimeconstraint_p.h index 7be4f025..78c4e47a 100644 --- a/src/uml/qtimeconstraint_p.h +++ b/src/uml/qtimeconstraint_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QTimeInterval *specification; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeevent.cpp b/src/uml/qtimeevent.cpp index 80ec4279..2d1550dd 100644 --- a/src/uml/qtimeevent.cpp +++ b/src/uml/qtimeevent.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTimeEventPrivate::QTimeEventPrivate() : isRelative(false), @@ -150,24 +153,26 @@ void QTimeEvent::setWhen(QTimeExpression *when) void QTimeEvent::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether it is relative or absolute time."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the corresponding time deadline."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies whether it is relative or absolute time."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the corresponding time deadline."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeEvent")][QString::fromLatin1("when")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QEvent::setPropertyData(); } -#include "moc_qtimeevent.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtimeevent.cpp" diff --git a/src/uml/qtimeevent.h b/src/uml/qtimeevent.h index 3a14f4c9..e7c56c33 100644 --- a/src/uml/qtimeevent.h +++ b/src/uml/qtimeevent.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QTimeEvent : public QEvent Q_OBJECT Q_PROPERTY(bool isRelative READ isRelative WRITE setRelative RESET unsetRelative) - Q_PROPERTY(QTimeExpression * when READ when WRITE setWhen) + Q_PROPERTY(QtUml::QTimeExpression * when READ when WRITE setWhen) Q_DISABLE_COPY(QTimeEvent) Q_DECLARE_PRIVATE(QTimeEvent) @@ -86,7 +89,9 @@ protected: explicit QTimeEvent(QTimeEventPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeevent_p.h b/src/uml/qtimeevent_p.h index 4a1ef008..202b3e9d 100644 --- a/src/uml/qtimeevent_p.h +++ b/src/uml/qtimeevent_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QTimeExpression *when; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeexpression.cpp b/src/uml/qtimeexpression.cpp index 5fbd4751..80974e51 100644 --- a/src/uml/qtimeexpression.cpp +++ b/src/uml/qtimeexpression.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTimeExpressionPrivate::QTimeExpressionPrivate() : expr(0) @@ -147,24 +150,26 @@ void QTimeExpression::setExpr(QValueSpecification *expr) void QTimeExpression::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the time and duration observations that are involved in expr."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of the time expression."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the time and duration observations that are involved in expr."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of the time expression."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeExpression")][QString::fromLatin1("expr")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QValueSpecification::setPropertyData(); } -#include "moc_qtimeexpression.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtimeexpression.cpp" diff --git a/src/uml/qtimeexpression.h b/src/uml/qtimeexpression.h index ad5ae190..571847e4 100644 --- a/src/uml/qtimeexpression.h +++ b/src/uml/qtimeexpression.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -64,8 +67,8 @@ class Q_UML_EXPORT QTimeExpression : public QValueSpecification { Q_OBJECT - Q_PROPERTY(QSet<QObservation *> observations READ observations) - Q_PROPERTY(QValueSpecification * expr READ expr WRITE setExpr) + Q_PROPERTY(QSet<QtUml::QObservation *> observations READ observations) + Q_PROPERTY(QtUml::QValueSpecification * expr READ expr WRITE setExpr) Q_DISABLE_COPY(QTimeExpression) Q_DECLARE_PRIVATE(QTimeExpression) @@ -87,7 +90,9 @@ protected: explicit QTimeExpression(QTimeExpressionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeexpression_p.h b/src/uml/qtimeexpression_p.h index 5050a980..57319eb0 100644 --- a/src/uml/qtimeexpression_p.h +++ b/src/uml/qtimeexpression_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ public: QValueSpecification *expr; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeinterval.cpp b/src/uml/qtimeinterval.cpp index 52331155..a0757809 100644 --- a/src/uml/qtimeinterval.cpp +++ b/src/uml/qtimeinterval.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTimeIntervalPrivate::QTimeIntervalPrivate() : max(0), @@ -136,24 +139,26 @@ void QTimeInterval::setMin(QTimeExpression *min) void QTimeInterval::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the TimeExpression denoting the maximum value of the range."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::max"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the TimeExpression denoting the minimum value of the range."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::min"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the TimeExpression denoting the maximum value of the range."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::max"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Refers to the TimeExpression denoting the minimum value of the range."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QInterval::min"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeInterval")][QString::fromLatin1("min")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInterval::setPropertyData(); } -#include "moc_qtimeinterval.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtimeinterval.cpp" diff --git a/src/uml/qtimeinterval.h b/src/uml/qtimeinterval.h index be055847..b482d3b9 100644 --- a/src/uml/qtimeinterval.h +++ b/src/uml/qtimeinterval.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,8 +64,8 @@ class Q_UML_EXPORT QTimeInterval : public QInterval { Q_OBJECT - Q_PROPERTY(QTimeExpression * max READ max WRITE setMax) - Q_PROPERTY(QTimeExpression * min READ min WRITE setMin) + Q_PROPERTY(QtUml::QTimeExpression * max READ max WRITE setMax) + Q_PROPERTY(QtUml::QTimeExpression * min READ min WRITE setMin) Q_DISABLE_COPY(QTimeInterval) Q_DECLARE_PRIVATE(QTimeInterval) @@ -83,7 +86,9 @@ protected: explicit QTimeInterval(QTimeIntervalPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeinterval_p.h b/src/uml/qtimeinterval_p.h index f2592595..78b8a313 100644 --- a/src/uml/qtimeinterval_p.h +++ b/src/uml/qtimeinterval_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QTimeExpression *min; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeobservation.cpp b/src/uml/qtimeobservation.cpp index 4cb19dc0..3765a0d3 100644 --- a/src/uml/qtimeobservation.cpp +++ b/src/uml/qtimeobservation.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTimeObservationPrivate::QTimeObservationPrivate() : firstEvent(true), @@ -142,24 +145,26 @@ void QTimeObservation::setEvent(QNamedElement *event) void QTimeObservation::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent is related to event. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters event. If firstEvent is false, then the corresponding observation event is the time instant the execution exits event."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The observation is determined by the entering or exiting of the event element during execution."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The value of firstEvent is related to event. If firstEvent is true, then the corresponding observation event is the first time instant the execution enters event. If firstEvent is false, then the corresponding observation event is the time instant the execution exits event."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The observation is determined by the entering or exiting of the event element during execution."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTimeObservation")][QString::fromLatin1("event")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QObservation::setPropertyData(); } -#include "moc_qtimeobservation.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtimeobservation.cpp" diff --git a/src/uml/qtimeobservation.h b/src/uml/qtimeobservation.h index 219d694f..ef4f267f 100644 --- a/src/uml/qtimeobservation.h +++ b/src/uml/qtimeobservation.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,7 @@ class Q_UML_EXPORT QTimeObservation : public QObservation Q_OBJECT Q_PROPERTY(bool firstEvent READ firstEvent WRITE setFirstEvent RESET unsetFirstEvent) - Q_PROPERTY(QNamedElement * event READ event WRITE setEvent) + Q_PROPERTY(QtUml::QNamedElement * event READ event WRITE setEvent) Q_DISABLE_COPY(QTimeObservation) Q_DECLARE_PRIVATE(QTimeObservation) @@ -86,7 +89,9 @@ protected: explicit QTimeObservation(QTimeObservationPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtimeobservation_p.h b/src/uml/qtimeobservation_p.h index ce17aa88..194c0e93 100644 --- a/src/uml/qtimeobservation_p.h +++ b/src/uml/qtimeobservation_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QNamedElement *event; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtransition.cpp b/src/uml/qtransition.cpp index ed66311d..2ac0b0be 100644 --- a/src/uml/qtransition.cpp +++ b/src/uml/qtransition.cpp @@ -54,10 +54,13 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTransitionPrivate::QTransitionPrivate() : - kind(QtUml::TransitionExternal), + kind(QtUmlNS::TransitionExternal), guard(0), target(0), effect(0), @@ -157,12 +160,12 @@ void QTransition::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QTransition::visibility() const +QtUmlNS::VisibilityKind QTransition::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QTransition::setVisibility(QtUml::VisibilityKind visibility) +void QTransition::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -343,7 +346,7 @@ QSet<QNamedElement *> QTransition::ownedMembers() const /*! Indicates the precise type of the transition. */ -QtUml::TransitionKind QTransition::kind() const +QtUmlNS::TransitionKind QTransition::kind() const { // This is a read-write attribute @@ -351,7 +354,7 @@ QtUml::TransitionKind QTransition::kind() const return d->kind; } -void QTransition::setKind(QtUml::TransitionKind kind) +void QTransition::setKind(QtUmlNS::TransitionKind kind) { // This is a read-write attribute @@ -364,7 +367,7 @@ void QTransition::setKind(QtUml::TransitionKind kind) void QTransition::unsetKind() { - setKind(QtUml::TransitionExternal); + setKind(QtUmlNS::TransitionExternal); Q_D(QTransition); d->modifiedResettableProperties.removeAll(QString::fromLatin1("kind")); } @@ -622,73 +625,75 @@ bool QTransition::isConsistentWith(const QRedefinableElement *redefinee) const void QTransition::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the precise type of the transition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A guard is a constraint that provides a fine-grained control over the firing of the transition. The guard is evaluated when an event occurrence is dispatched by the state machine. If the guard is true at that time, the transition may be enabled, otherwise, it is disabled. Guards should be pure expressions without side effects. Guard expressions with side effects are ill formed."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the target vertex that is reached when the transition is taken."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVertex::incoming"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies an optional behavior to be performed when the transition fires."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("container")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("container")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("container")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the region that owns this transition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("container")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("container")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("container")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::transition"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifier in which context this element may be redefined."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The transition that is redefined by this transition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("source")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("source")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("source")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the originating vertex (state or pseudostate) of the transition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("source")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("source")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("source")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVertex::outgoing"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the triggers that may fire the transition."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Indicates the precise type of the transition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A guard is a constraint that provides a fine-grained control over the firing of the transition. The guard is evaluated when an event occurrence is dispatched by the state machine. If the guard is true at that time, the transition may be enabled, otherwise, it is disabled. Guards should be pure expressions without side effects. Guard expressions with side effects are ill formed."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedRules"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("guard")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("target")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("target")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("target")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the target vertex that is reached when the transition is taken."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("target")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("target")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("target")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVertex::incoming"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies an optional behavior to be performed when the transition fires."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("effect")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("container")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("container")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("container")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the region that owns this transition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("container")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("container")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("container")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::transition"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the classifier in which context this element may be redefined."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinitionContexts"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinitionContext")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The transition that is redefined by this transition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QRedefinableElement::redefinedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("redefinedTransition")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("source")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("source")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("source")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Designates the originating vertex (state or pseudostate) of the transition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("source")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("source")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("source")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QVertex::outgoing"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the triggers that may fire the transition."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTransition")][QString::fromLatin1("triggers")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QWrappedObject::setPropertyData(); } -#include "moc_qtransition.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtransition.cpp" diff --git a/src/uml/qtransition.h b/src/uml/qtransition.h index 4af03535..4aaa1ce5 100644 --- a/src/uml/qtransition.h +++ b/src/uml/qtransition.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -75,36 +78,36 @@ class Q_UML_EXPORT QTransition : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) Q_PROPERTY(bool isLeaf READ isLeaf WRITE setLeaf RESET unsetLeaf) - Q_PROPERTY(QSet<QRedefinableElement *> redefinedElements READ redefinedElements) - - Q_PROPERTY(QSet<QPackageImport *> packageImports READ packageImports) - Q_PROPERTY(QSet<QNamedElement *> members READ members) - Q_PROPERTY(QSet<QPackageableElement *> importedMembers READ importedMembers STORED false) - Q_PROPERTY(QSet<QElementImport *> elementImports READ elementImports) - Q_PROPERTY(QSet<QConstraint *> ownedRules READ ownedRules) - Q_PROPERTY(QSet<QNamedElement *> ownedMembers READ ownedMembers) - - Q_PROPERTY(QtUml::TransitionKind kind READ kind WRITE setKind RESET unsetKind) - Q_PROPERTY(QConstraint * guard READ guard WRITE setGuard) - Q_PROPERTY(QVertex * target READ target WRITE setTarget) - Q_PROPERTY(QBehavior * effect READ effect WRITE setEffect) - Q_PROPERTY(QRegion * container READ container WRITE setContainer) - Q_PROPERTY(QClassifier * redefinitionContext READ redefinitionContext STORED false) - Q_PROPERTY(QTransition * redefinedTransition READ redefinedTransition WRITE setRedefinedTransition) - Q_PROPERTY(QVertex * source READ source WRITE setSource) - Q_PROPERTY(QSet<QTrigger *> triggers READ triggers) + Q_PROPERTY(QSet<QtUml::QRedefinableElement *> redefinedElements READ redefinedElements) + + Q_PROPERTY(QSet<QtUml::QPackageImport *> packageImports READ packageImports) + Q_PROPERTY(QSet<QtUml::QNamedElement *> members READ members) + Q_PROPERTY(QSet<QtUml::QPackageableElement *> importedMembers READ importedMembers STORED false) + Q_PROPERTY(QSet<QtUml::QElementImport *> elementImports READ elementImports) + Q_PROPERTY(QSet<QtUml::QConstraint *> ownedRules READ ownedRules) + Q_PROPERTY(QSet<QtUml::QNamedElement *> ownedMembers READ ownedMembers) + + Q_PROPERTY(QtUmlNS::TransitionKind kind READ kind WRITE setKind RESET unsetKind) + Q_PROPERTY(QtUml::QConstraint * guard READ guard WRITE setGuard) + Q_PROPERTY(QtUml::QVertex * target READ target WRITE setTarget) + Q_PROPERTY(QtUml::QBehavior * effect READ effect WRITE setEffect) + Q_PROPERTY(QtUml::QRegion * container READ container WRITE setContainer) + Q_PROPERTY(QtUml::QClassifier * redefinitionContext READ redefinitionContext STORED false) + Q_PROPERTY(QtUml::QTransition * redefinedTransition READ redefinedTransition WRITE setRedefinedTransition) + Q_PROPERTY(QtUml::QVertex * source READ source WRITE setSource) + Q_PROPERTY(QSet<QtUml::QTrigger *> triggers READ triggers) Q_DISABLE_COPY(QTransition) Q_DECLARE_PRIVATE(QTransition) @@ -123,8 +126,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -158,8 +161,8 @@ public: Q_INVOKABLE QSet<QNamedElement *> ownedMembers() const; // Attributes from QTransition - Q_INVOKABLE QtUml::TransitionKind kind() const; - Q_INVOKABLE void setKind(QtUml::TransitionKind kind); + Q_INVOKABLE QtUmlNS::TransitionKind kind() const; + Q_INVOKABLE void setKind(QtUmlNS::TransitionKind kind); Q_INVOKABLE void unsetKind(); // Association ends from QTransition @@ -194,7 +197,9 @@ private: QNamespace *_wrappedNamespace; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtransition_p.h b/src/uml/qtransition_p.h index 3bbc6c69..f9fcb62b 100644 --- a/src/uml/qtransition_p.h +++ b/src/uml/qtransition_p.h @@ -56,7 +56,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -78,7 +81,7 @@ public: explicit QTransitionPrivate(); virtual ~QTransitionPrivate(); - QtUml::TransitionKind kind; + QtUmlNS::TransitionKind kind; QConstraint *guard; QVertex *target; QBehavior *effect; @@ -88,7 +91,9 @@ public: QSet<QTrigger *> triggers; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtrigger.cpp b/src/uml/qtrigger.cpp index f737f6f6..204bd71f 100644 --- a/src/uml/qtrigger.cpp +++ b/src/uml/qtrigger.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTriggerPrivate::QTriggerPrivate() : event(0) @@ -140,24 +143,26 @@ void QTrigger::setEvent(QEvent *event) void QTrigger::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A optional port of the receiver object on which the behavioral feature is invoked."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The event that causes the trigger."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A optional port of the receiver object on which the behavioral feature is invoked."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The event that causes the trigger."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTrigger")][QString::fromLatin1("event")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qtrigger.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtrigger.cpp" diff --git a/src/uml/qtrigger.h b/src/uml/qtrigger.h index 0f7a3043..af8aaf80 100644 --- a/src/uml/qtrigger.h +++ b/src/uml/qtrigger.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,8 +68,8 @@ class Q_UML_EXPORT QTrigger : public QNamedElement { Q_OBJECT - Q_PROPERTY(QSet<QPort *> ports READ ports) - Q_PROPERTY(QEvent * event READ event WRITE setEvent) + Q_PROPERTY(QSet<QtUml::QPort *> ports READ ports) + Q_PROPERTY(QtUml::QEvent * event READ event WRITE setEvent) Q_DISABLE_COPY(QTrigger) Q_DECLARE_PRIVATE(QTrigger) @@ -88,7 +91,9 @@ protected: explicit QTrigger(QTriggerPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtrigger_p.h b/src/uml/qtrigger_p.h index ed694270..4258e22a 100644 --- a/src/uml/qtrigger_p.h +++ b/src/uml/qtrigger_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QEvent *event; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtumlglobal.h b/src/uml/qtumlglobal.h index 57612138..a9e158c0 100644 --- a/src/uml/qtumlglobal.h +++ b/src/uml/qtumlglobal.h @@ -60,8 +60,6 @@ QT_BEGIN_HEADER #if defined(Q_MOC_RUN) #define QT_NAMESPACE_QTUML -#define QT_BEGIN_NAMESPACE_QTUML -#define QT_END_NAMESPACE_QTUML #define QT_USE_NAMESPACE_QTUML #define QT_PREPEND_NAMESPACE_QTUML(name) ::name @@ -73,8 +71,6 @@ QT_BEGIN_HEADER # define QT_NAMESPACE_QTUML QtUml #endif -#define QT_BEGIN_NAMESPACE_QTUML QT_BEGIN_NAMESPACE namespace QtUml { -#define QT_END_NAMESPACE_QTUML QT_END_NAMESPACE } #define QT_USE_NAMESPACE_QTUML using namespace ::QT_NAMESPACE_QTUML; #define QT_PREPEND_NAMESPACE_QTUML(name) ::QT_NAMESPACE_QTUML::name diff --git a/src/uml/qtumlnamespace.cpp b/src/uml/qtumlnamespace.cpp index bcf97dce..c8fd444b 100644 --- a/src/uml/qtumlnamespace.cpp +++ b/src/uml/qtumlnamespace.cpp @@ -41,14 +41,10 @@ #include "qtumlnamespace.h" -QT_BEGIN_NAMESPACE_QTUML - -QtUml::QtUml() -{ -} +QT_BEGIN_NAMESPACE /*! - \enum QtUml::QtUml::AggregationKind + \enum QtUmlNS::AggregationKind AggregationKind is an enumeration type that specifies the literals for defining the kind of aggregation of a property. @@ -61,7 +57,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::CallConcurrencyKind + \enum QtUmlNS::CallConcurrencyKind CallConcurrencyKind is an enumeration type. @@ -74,7 +70,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::ConnectorKind + \enum QtUmlNS::ConnectorKind ConnectorKind is an enumeration type. @@ -85,7 +81,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::ExpansionKind + \enum QtUmlNS::ExpansionKind ExpansionKind is an enumeration type used to specify how multiple executions of an expansion region interact. @@ -98,7 +94,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::InteractionOperatorKind + \enum QtUmlNS::InteractionOperatorKind 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. @@ -129,7 +125,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::MessageKind + \enum QtUmlNS::MessageKind This is an enumerated type that identifies the type of message. @@ -144,7 +140,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::MessageSort + \enum QtUmlNS::MessageSort This is an enumerated type that identifies the type of communication action that was used to generate the message. @@ -163,7 +159,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::ObjectNodeOrderingKind + \enum QtUmlNS::ObjectNodeOrderingKind ObjectNodeOrderingKind is an enumeration indicating queuing order within a node. @@ -178,7 +174,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::ParameterDirectionKind + \enum QtUmlNS::ParameterDirectionKind Parameter direction kind is an enumeration type that defines literals used to specify direction of parameters. @@ -193,7 +189,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::ParameterEffectKind + \enum QtUmlNS::ParameterEffectKind The datatype ParameterEffectKind is an enumeration that indicates the effect of a behavior on values passed in or out of its parameters. @@ -208,7 +204,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::PseudostateKind + \enum QtUmlNS::PseudostateKind PseudostateKind is an enumeration type. @@ -235,7 +231,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::TransitionKind + \enum QtUmlNS::TransitionKind TransitionKind is an enumeration type. @@ -248,7 +244,7 @@ QtUml::QtUml() */ /*! - \enum QtUml::QtUml::VisibilityKind + \enum QtUmlNS::VisibilityKind VisibilityKind is an enumeration type that defines literals to determine the visibility of elements in a model. @@ -262,7 +258,5 @@ QtUml::QtUml() 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. */ -#include "moc_qtumlnamespace.cpp" - -QT_END_NAMESPACE_QTUML +QT_END_NAMESPACE diff --git a/src/uml/qtumlnamespace.h b/src/uml/qtumlnamespace.h index f46ca866..f1fc4e5a 100644 --- a/src/uml/qtumlnamespace.h +++ b/src/uml/qtumlnamespace.h @@ -47,11 +47,11 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE QT_MODULE(QtUml) -class Q_UML_EXPORT QtUml : public QObject +class Q_UML_EXPORT QtUmlNS : public QObject { Q_OBJECT @@ -172,11 +172,9 @@ public: VisibilityPackage }; -private: - explicit QtUml(); }; -QT_END_NAMESPACE_QTUML +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtype.cpp b/src/uml/qtype.cpp index 36fc1c83..f42970b0 100644 --- a/src/uml/qtype.cpp +++ b/src/uml/qtype.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTypePrivate::QTypePrivate() : package(0) @@ -130,17 +133,19 @@ bool QType::conformsTo(const QType *other) const void QType::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the owning package of this classifier, if any."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::ownedType"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QType")][QString::fromLatin1("package")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QType")][QString::fromLatin1("package")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QType")][QString::fromLatin1("package")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the owning package of this classifier, if any."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QType")][QString::fromLatin1("package")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QType")][QString::fromLatin1("package")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QType")][QString::fromLatin1("package")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QPackage::ownedType"); QPackageableElement::setPropertyData(); } -#include "moc_qtype.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtype.cpp" diff --git a/src/uml/qtype.h b/src/uml/qtype.h index b926190b..1804f079 100644 --- a/src/uml/qtype.h +++ b/src/uml/qtype.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QType : public QPackageableElement { Q_OBJECT - Q_PROPERTY(QPackage * package READ package WRITE setPackage) + Q_PROPERTY(QtUml::QPackage * package READ package WRITE setPackage) Q_DISABLE_COPY(QType) Q_DECLARE_PRIVATE(QType) @@ -83,7 +86,9 @@ protected: explicit QType(QTypePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtype_p.h b/src/uml/qtype_p.h index 623ad26d..3baedb09 100644 --- a/src/uml/qtype_p.h +++ b/src/uml/qtype_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QPackage *package; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtypedelement.cpp b/src/uml/qtypedelement.cpp index e4d60d6d..0a567c86 100644 --- a/src/uml/qtypedelement.cpp +++ b/src/uml/qtypedelement.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QTypedElementPrivate::QTypedElementPrivate() : type(0) @@ -108,17 +111,19 @@ void QTypedElement::setType(QType *type) void QTypedElement::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.The type of the TypedElement."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("This information is derived from the return result for this Operation.The type of the TypedElement."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QNamedElement::setPropertyData(); } -#include "moc_qtypedelement.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qtypedelement.cpp" diff --git a/src/uml/qtypedelement.h b/src/uml/qtypedelement.h index 6e4a8462..a10994b5 100644 --- a/src/uml/qtypedelement.h +++ b/src/uml/qtypedelement.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QTypedElement : public QNamedElement { Q_OBJECT - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) Q_DISABLE_COPY(QTypedElement) Q_DECLARE_PRIVATE(QTypedElement) @@ -80,7 +83,9 @@ protected: explicit QTypedElement(QTypedElementPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qtypedelement_p.h b/src/uml/qtypedelement_p.h index 38cf151a..9341bbf4 100644 --- a/src/uml/qtypedelement_p.h +++ b/src/uml/qtypedelement_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,7 +69,9 @@ public: QType *type; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qumlmetamodel.cpp b/src/uml/qumlmetamodel.cpp index 5ed2a8ac..af891501 100644 --- a/src/uml/qumlmetamodel.cpp +++ b/src/uml/qumlmetamodel.cpp @@ -41,736 +41,742 @@ #include "qumlmetamodel.h" -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ void QUmlMetaModel::init(QScriptEngine *scriptEngine) { - qRegisterMetaType<QAbstraction *>("QtUml::QAbstraction *"); - qRegisterMetaType<QList<QAbstraction *>>("QList<QtUml::QAbstraction *>"); - qRegisterMetaType<QSet<QAbstraction *>>("QSet<QtUml::QAbstraction *>"); - qRegisterMetaType<QAcceptCallAction *>("QtUml::QAcceptCallAction *"); - qRegisterMetaType<QList<QAcceptCallAction *>>("QList<QtUml::QAcceptCallAction *>"); - qRegisterMetaType<QSet<QAcceptCallAction *>>("QSet<QtUml::QAcceptCallAction *>"); - qRegisterMetaType<QAcceptEventAction *>("QtUml::QAcceptEventAction *"); - qRegisterMetaType<QList<QAcceptEventAction *>>("QList<QtUml::QAcceptEventAction *>"); - qRegisterMetaType<QSet<QAcceptEventAction *>>("QSet<QtUml::QAcceptEventAction *>"); - qRegisterMetaType<QAction *>("QtUml::QAction *"); - qRegisterMetaType<QList<QAction *>>("QList<QtUml::QAction *>"); - qRegisterMetaType<QSet<QAction *>>("QSet<QtUml::QAction *>"); - qRegisterMetaType<QActionExecutionSpecification *>("QtUml::QActionExecutionSpecification *"); - qRegisterMetaType<QList<QActionExecutionSpecification *>>("QList<QtUml::QActionExecutionSpecification *>"); - qRegisterMetaType<QSet<QActionExecutionSpecification *>>("QSet<QtUml::QActionExecutionSpecification *>"); - qRegisterMetaType<QActionInputPin *>("QtUml::QActionInputPin *"); - qRegisterMetaType<QList<QActionInputPin *>>("QList<QtUml::QActionInputPin *>"); - qRegisterMetaType<QSet<QActionInputPin *>>("QSet<QtUml::QActionInputPin *>"); - qRegisterMetaType<QActivity *>("QtUml::QActivity *"); - qRegisterMetaType<QList<QActivity *>>("QList<QtUml::QActivity *>"); - qRegisterMetaType<QSet<QActivity *>>("QSet<QtUml::QActivity *>"); - qRegisterMetaType<QActivityEdge *>("QtUml::QActivityEdge *"); - qRegisterMetaType<QList<QActivityEdge *>>("QList<QtUml::QActivityEdge *>"); - qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QtUml::QActivityEdge *>"); - qRegisterMetaType<QActivityFinalNode *>("QtUml::QActivityFinalNode *"); - qRegisterMetaType<QList<QActivityFinalNode *>>("QList<QtUml::QActivityFinalNode *>"); - qRegisterMetaType<QSet<QActivityFinalNode *>>("QSet<QtUml::QActivityFinalNode *>"); - qRegisterMetaType<QActivityGroup *>("QtUml::QActivityGroup *"); - qRegisterMetaType<QList<QActivityGroup *>>("QList<QtUml::QActivityGroup *>"); - qRegisterMetaType<QSet<QActivityGroup *>>("QSet<QtUml::QActivityGroup *>"); - qRegisterMetaType<QActivityNode *>("QtUml::QActivityNode *"); - qRegisterMetaType<QList<QActivityNode *>>("QList<QtUml::QActivityNode *>"); - qRegisterMetaType<QSet<QActivityNode *>>("QSet<QtUml::QActivityNode *>"); - qRegisterMetaType<QActivityParameterNode *>("QtUml::QActivityParameterNode *"); - qRegisterMetaType<QList<QActivityParameterNode *>>("QList<QtUml::QActivityParameterNode *>"); - qRegisterMetaType<QSet<QActivityParameterNode *>>("QSet<QtUml::QActivityParameterNode *>"); - qRegisterMetaType<QActivityPartition *>("QtUml::QActivityPartition *"); - qRegisterMetaType<QList<QActivityPartition *>>("QList<QtUml::QActivityPartition *>"); - qRegisterMetaType<QSet<QActivityPartition *>>("QSet<QtUml::QActivityPartition *>"); - qRegisterMetaType<QActor *>("QtUml::QActor *"); - qRegisterMetaType<QList<QActor *>>("QList<QtUml::QActor *>"); - qRegisterMetaType<QSet<QActor *>>("QSet<QtUml::QActor *>"); - qRegisterMetaType<QAddStructuralFeatureValueAction *>("QtUml::QAddStructuralFeatureValueAction *"); - qRegisterMetaType<QList<QAddStructuralFeatureValueAction *>>("QList<QtUml::QAddStructuralFeatureValueAction *>"); - qRegisterMetaType<QSet<QAddStructuralFeatureValueAction *>>("QSet<QtUml::QAddStructuralFeatureValueAction *>"); - qRegisterMetaType<QAddVariableValueAction *>("QtUml::QAddVariableValueAction *"); - qRegisterMetaType<QList<QAddVariableValueAction *>>("QList<QtUml::QAddVariableValueAction *>"); - qRegisterMetaType<QSet<QAddVariableValueAction *>>("QSet<QtUml::QAddVariableValueAction *>"); - qRegisterMetaType<QAnyReceiveEvent *>("QtUml::QAnyReceiveEvent *"); - qRegisterMetaType<QList<QAnyReceiveEvent *>>("QList<QtUml::QAnyReceiveEvent *>"); - qRegisterMetaType<QSet<QAnyReceiveEvent *>>("QSet<QtUml::QAnyReceiveEvent *>"); - qRegisterMetaType<QArtifact *>("QtUml::QArtifact *"); - qRegisterMetaType<QList<QArtifact *>>("QList<QtUml::QArtifact *>"); - qRegisterMetaType<QSet<QArtifact *>>("QSet<QtUml::QArtifact *>"); - qRegisterMetaType<QAssociation *>("QtUml::QAssociation *"); - qRegisterMetaType<QList<QAssociation *>>("QList<QtUml::QAssociation *>"); - qRegisterMetaType<QSet<QAssociation *>>("QSet<QtUml::QAssociation *>"); - qRegisterMetaType<QAssociationClass *>("QtUml::QAssociationClass *"); - qRegisterMetaType<QList<QAssociationClass *>>("QList<QtUml::QAssociationClass *>"); - qRegisterMetaType<QSet<QAssociationClass *>>("QSet<QtUml::QAssociationClass *>"); - qRegisterMetaType<QBehavior *>("QtUml::QBehavior *"); - qRegisterMetaType<QList<QBehavior *>>("QList<QtUml::QBehavior *>"); - qRegisterMetaType<QSet<QBehavior *>>("QSet<QtUml::QBehavior *>"); - qRegisterMetaType<QBehavioralFeature *>("QtUml::QBehavioralFeature *"); - qRegisterMetaType<QList<QBehavioralFeature *>>("QList<QtUml::QBehavioralFeature *>"); - qRegisterMetaType<QSet<QBehavioralFeature *>>("QSet<QtUml::QBehavioralFeature *>"); - qRegisterMetaType<QBehavioredClassifier *>("QtUml::QBehavioredClassifier *"); - qRegisterMetaType<QList<QBehavioredClassifier *>>("QList<QtUml::QBehavioredClassifier *>"); - qRegisterMetaType<QSet<QBehavioredClassifier *>>("QSet<QtUml::QBehavioredClassifier *>"); - qRegisterMetaType<QBehaviorExecutionSpecification *>("QtUml::QBehaviorExecutionSpecification *"); - qRegisterMetaType<QList<QBehaviorExecutionSpecification *>>("QList<QtUml::QBehaviorExecutionSpecification *>"); - qRegisterMetaType<QSet<QBehaviorExecutionSpecification *>>("QSet<QtUml::QBehaviorExecutionSpecification *>"); - qRegisterMetaType<QBroadcastSignalAction *>("QtUml::QBroadcastSignalAction *"); - qRegisterMetaType<QList<QBroadcastSignalAction *>>("QList<QtUml::QBroadcastSignalAction *>"); - qRegisterMetaType<QSet<QBroadcastSignalAction *>>("QSet<QtUml::QBroadcastSignalAction *>"); - qRegisterMetaType<QCallAction *>("QtUml::QCallAction *"); - qRegisterMetaType<QList<QCallAction *>>("QList<QtUml::QCallAction *>"); - qRegisterMetaType<QSet<QCallAction *>>("QSet<QtUml::QCallAction *>"); - qRegisterMetaType<QCallBehaviorAction *>("QtUml::QCallBehaviorAction *"); - qRegisterMetaType<QList<QCallBehaviorAction *>>("QList<QtUml::QCallBehaviorAction *>"); - qRegisterMetaType<QSet<QCallBehaviorAction *>>("QSet<QtUml::QCallBehaviorAction *>"); - qRegisterMetaType<QCallEvent *>("QtUml::QCallEvent *"); - qRegisterMetaType<QList<QCallEvent *>>("QList<QtUml::QCallEvent *>"); - qRegisterMetaType<QSet<QCallEvent *>>("QSet<QtUml::QCallEvent *>"); - qRegisterMetaType<QCallOperationAction *>("QtUml::QCallOperationAction *"); - qRegisterMetaType<QList<QCallOperationAction *>>("QList<QtUml::QCallOperationAction *>"); - qRegisterMetaType<QSet<QCallOperationAction *>>("QSet<QtUml::QCallOperationAction *>"); - qRegisterMetaType<QCentralBufferNode *>("QtUml::QCentralBufferNode *"); - qRegisterMetaType<QList<QCentralBufferNode *>>("QList<QtUml::QCentralBufferNode *>"); - qRegisterMetaType<QSet<QCentralBufferNode *>>("QSet<QtUml::QCentralBufferNode *>"); - qRegisterMetaType<QChangeEvent *>("QtUml::QChangeEvent *"); - qRegisterMetaType<QList<QChangeEvent *>>("QList<QtUml::QChangeEvent *>"); - qRegisterMetaType<QSet<QChangeEvent *>>("QSet<QtUml::QChangeEvent *>"); - qRegisterMetaType<QClass *>("QtUml::QClass *"); - qRegisterMetaType<QList<QClass *>>("QList<QtUml::QClass *>"); - qRegisterMetaType<QSet<QClass *>>("QSet<QtUml::QClass *>"); - qRegisterMetaType<QClassifier *>("QtUml::QClassifier *"); - qRegisterMetaType<QList<QClassifier *>>("QList<QtUml::QClassifier *>"); - qRegisterMetaType<QSet<QClassifier *>>("QSet<QtUml::QClassifier *>"); - qRegisterMetaType<QClassifierTemplateParameter *>("QtUml::QClassifierTemplateParameter *"); - qRegisterMetaType<QList<QClassifierTemplateParameter *>>("QList<QtUml::QClassifierTemplateParameter *>"); - qRegisterMetaType<QSet<QClassifierTemplateParameter *>>("QSet<QtUml::QClassifierTemplateParameter *>"); - qRegisterMetaType<QClause *>("QtUml::QClause *"); - qRegisterMetaType<QList<QClause *>>("QList<QtUml::QClause *>"); - qRegisterMetaType<QSet<QClause *>>("QSet<QtUml::QClause *>"); - qRegisterMetaType<QClearAssociationAction *>("QtUml::QClearAssociationAction *"); - qRegisterMetaType<QList<QClearAssociationAction *>>("QList<QtUml::QClearAssociationAction *>"); - qRegisterMetaType<QSet<QClearAssociationAction *>>("QSet<QtUml::QClearAssociationAction *>"); - qRegisterMetaType<QClearStructuralFeatureAction *>("QtUml::QClearStructuralFeatureAction *"); - qRegisterMetaType<QList<QClearStructuralFeatureAction *>>("QList<QtUml::QClearStructuralFeatureAction *>"); - qRegisterMetaType<QSet<QClearStructuralFeatureAction *>>("QSet<QtUml::QClearStructuralFeatureAction *>"); - qRegisterMetaType<QClearVariableAction *>("QtUml::QClearVariableAction *"); - qRegisterMetaType<QList<QClearVariableAction *>>("QList<QtUml::QClearVariableAction *>"); - qRegisterMetaType<QSet<QClearVariableAction *>>("QSet<QtUml::QClearVariableAction *>"); - qRegisterMetaType<QCollaboration *>("QtUml::QCollaboration *"); - qRegisterMetaType<QList<QCollaboration *>>("QList<QtUml::QCollaboration *>"); - qRegisterMetaType<QSet<QCollaboration *>>("QSet<QtUml::QCollaboration *>"); - qRegisterMetaType<QCollaborationUse *>("QtUml::QCollaborationUse *"); - qRegisterMetaType<QList<QCollaborationUse *>>("QList<QtUml::QCollaborationUse *>"); - qRegisterMetaType<QSet<QCollaborationUse *>>("QSet<QtUml::QCollaborationUse *>"); - qRegisterMetaType<QCombinedFragment *>("QtUml::QCombinedFragment *"); - qRegisterMetaType<QList<QCombinedFragment *>>("QList<QtUml::QCombinedFragment *>"); - qRegisterMetaType<QSet<QCombinedFragment *>>("QSet<QtUml::QCombinedFragment *>"); - qRegisterMetaType<QComment *>("QtUml::QComment *"); - qRegisterMetaType<QList<QComment *>>("QList<QtUml::QComment *>"); - qRegisterMetaType<QSet<QComment *>>("QSet<QtUml::QComment *>"); - qRegisterMetaType<QCommunicationPath *>("QtUml::QCommunicationPath *"); - qRegisterMetaType<QList<QCommunicationPath *>>("QList<QtUml::QCommunicationPath *>"); - qRegisterMetaType<QSet<QCommunicationPath *>>("QSet<QtUml::QCommunicationPath *>"); - qRegisterMetaType<QComponent *>("QtUml::QComponent *"); - qRegisterMetaType<QList<QComponent *>>("QList<QtUml::QComponent *>"); - qRegisterMetaType<QSet<QComponent *>>("QSet<QtUml::QComponent *>"); - qRegisterMetaType<QComponentRealization *>("QtUml::QComponentRealization *"); - qRegisterMetaType<QList<QComponentRealization *>>("QList<QtUml::QComponentRealization *>"); - qRegisterMetaType<QSet<QComponentRealization *>>("QSet<QtUml::QComponentRealization *>"); - qRegisterMetaType<QConditionalNode *>("QtUml::QConditionalNode *"); - qRegisterMetaType<QList<QConditionalNode *>>("QList<QtUml::QConditionalNode *>"); - qRegisterMetaType<QSet<QConditionalNode *>>("QSet<QtUml::QConditionalNode *>"); - qRegisterMetaType<QConnectableElement *>("QtUml::QConnectableElement *"); - qRegisterMetaType<QList<QConnectableElement *>>("QList<QtUml::QConnectableElement *>"); - qRegisterMetaType<QSet<QConnectableElement *>>("QSet<QtUml::QConnectableElement *>"); - qRegisterMetaType<QConnectableElementTemplateParameter *>("QtUml::QConnectableElementTemplateParameter *"); - qRegisterMetaType<QList<QConnectableElementTemplateParameter *>>("QList<QtUml::QConnectableElementTemplateParameter *>"); - qRegisterMetaType<QSet<QConnectableElementTemplateParameter *>>("QSet<QtUml::QConnectableElementTemplateParameter *>"); - qRegisterMetaType<QConnectionPointReference *>("QtUml::QConnectionPointReference *"); - qRegisterMetaType<QList<QConnectionPointReference *>>("QList<QtUml::QConnectionPointReference *>"); - qRegisterMetaType<QSet<QConnectionPointReference *>>("QSet<QtUml::QConnectionPointReference *>"); - qRegisterMetaType<QConnector *>("QtUml::QConnector *"); - qRegisterMetaType<QList<QConnector *>>("QList<QtUml::QConnector *>"); - qRegisterMetaType<QSet<QConnector *>>("QSet<QtUml::QConnector *>"); - qRegisterMetaType<QConnectorEnd *>("QtUml::QConnectorEnd *"); - qRegisterMetaType<QList<QConnectorEnd *>>("QList<QtUml::QConnectorEnd *>"); - qRegisterMetaType<QSet<QConnectorEnd *>>("QSet<QtUml::QConnectorEnd *>"); - qRegisterMetaType<QConsiderIgnoreFragment *>("QtUml::QConsiderIgnoreFragment *"); - qRegisterMetaType<QList<QConsiderIgnoreFragment *>>("QList<QtUml::QConsiderIgnoreFragment *>"); - qRegisterMetaType<QSet<QConsiderIgnoreFragment *>>("QSet<QtUml::QConsiderIgnoreFragment *>"); - qRegisterMetaType<QConstraint *>("QtUml::QConstraint *"); - qRegisterMetaType<QList<QConstraint *>>("QList<QtUml::QConstraint *>"); - qRegisterMetaType<QSet<QConstraint *>>("QSet<QtUml::QConstraint *>"); - qRegisterMetaType<QContinuation *>("QtUml::QContinuation *"); - qRegisterMetaType<QList<QContinuation *>>("QList<QtUml::QContinuation *>"); - qRegisterMetaType<QSet<QContinuation *>>("QSet<QtUml::QContinuation *>"); - qRegisterMetaType<QControlFlow *>("QtUml::QControlFlow *"); - qRegisterMetaType<QList<QControlFlow *>>("QList<QtUml::QControlFlow *>"); - qRegisterMetaType<QSet<QControlFlow *>>("QSet<QtUml::QControlFlow *>"); - qRegisterMetaType<QControlNode *>("QtUml::QControlNode *"); - qRegisterMetaType<QList<QControlNode *>>("QList<QtUml::QControlNode *>"); - qRegisterMetaType<QSet<QControlNode *>>("QSet<QtUml::QControlNode *>"); - qRegisterMetaType<QCreateLinkAction *>("QtUml::QCreateLinkAction *"); - qRegisterMetaType<QList<QCreateLinkAction *>>("QList<QtUml::QCreateLinkAction *>"); - qRegisterMetaType<QSet<QCreateLinkAction *>>("QSet<QtUml::QCreateLinkAction *>"); - qRegisterMetaType<QCreateLinkObjectAction *>("QtUml::QCreateLinkObjectAction *"); - qRegisterMetaType<QList<QCreateLinkObjectAction *>>("QList<QtUml::QCreateLinkObjectAction *>"); - qRegisterMetaType<QSet<QCreateLinkObjectAction *>>("QSet<QtUml::QCreateLinkObjectAction *>"); - qRegisterMetaType<QCreateObjectAction *>("QtUml::QCreateObjectAction *"); - qRegisterMetaType<QList<QCreateObjectAction *>>("QList<QtUml::QCreateObjectAction *>"); - qRegisterMetaType<QSet<QCreateObjectAction *>>("QSet<QtUml::QCreateObjectAction *>"); - qRegisterMetaType<QDataStoreNode *>("QtUml::QDataStoreNode *"); - qRegisterMetaType<QList<QDataStoreNode *>>("QList<QtUml::QDataStoreNode *>"); - qRegisterMetaType<QSet<QDataStoreNode *>>("QSet<QtUml::QDataStoreNode *>"); - qRegisterMetaType<QDataType *>("QtUml::QDataType *"); - qRegisterMetaType<QList<QDataType *>>("QList<QtUml::QDataType *>"); - qRegisterMetaType<QSet<QDataType *>>("QSet<QtUml::QDataType *>"); - qRegisterMetaType<QDecisionNode *>("QtUml::QDecisionNode *"); - qRegisterMetaType<QList<QDecisionNode *>>("QList<QtUml::QDecisionNode *>"); - qRegisterMetaType<QSet<QDecisionNode *>>("QSet<QtUml::QDecisionNode *>"); - qRegisterMetaType<QDependency *>("QtUml::QDependency *"); - qRegisterMetaType<QList<QDependency *>>("QList<QtUml::QDependency *>"); - qRegisterMetaType<QSet<QDependency *>>("QSet<QtUml::QDependency *>"); - qRegisterMetaType<QDeployedArtifact *>("QtUml::QDeployedArtifact *"); - qRegisterMetaType<QList<QDeployedArtifact *>>("QList<QtUml::QDeployedArtifact *>"); - qRegisterMetaType<QSet<QDeployedArtifact *>>("QSet<QtUml::QDeployedArtifact *>"); - qRegisterMetaType<QDeployment *>("QtUml::QDeployment *"); - qRegisterMetaType<QList<QDeployment *>>("QList<QtUml::QDeployment *>"); - qRegisterMetaType<QSet<QDeployment *>>("QSet<QtUml::QDeployment *>"); - qRegisterMetaType<QDeploymentSpecification *>("QtUml::QDeploymentSpecification *"); - qRegisterMetaType<QList<QDeploymentSpecification *>>("QList<QtUml::QDeploymentSpecification *>"); - qRegisterMetaType<QSet<QDeploymentSpecification *>>("QSet<QtUml::QDeploymentSpecification *>"); - qRegisterMetaType<QDeploymentTarget *>("QtUml::QDeploymentTarget *"); - qRegisterMetaType<QList<QDeploymentTarget *>>("QList<QtUml::QDeploymentTarget *>"); - qRegisterMetaType<QSet<QDeploymentTarget *>>("QSet<QtUml::QDeploymentTarget *>"); - qRegisterMetaType<QDestroyLinkAction *>("QtUml::QDestroyLinkAction *"); - qRegisterMetaType<QList<QDestroyLinkAction *>>("QList<QtUml::QDestroyLinkAction *>"); - qRegisterMetaType<QSet<QDestroyLinkAction *>>("QSet<QtUml::QDestroyLinkAction *>"); - qRegisterMetaType<QDestroyObjectAction *>("QtUml::QDestroyObjectAction *"); - qRegisterMetaType<QList<QDestroyObjectAction *>>("QList<QtUml::QDestroyObjectAction *>"); - qRegisterMetaType<QSet<QDestroyObjectAction *>>("QSet<QtUml::QDestroyObjectAction *>"); - qRegisterMetaType<QDestructionOccurrenceSpecification *>("QtUml::QDestructionOccurrenceSpecification *"); - qRegisterMetaType<QList<QDestructionOccurrenceSpecification *>>("QList<QtUml::QDestructionOccurrenceSpecification *>"); - qRegisterMetaType<QSet<QDestructionOccurrenceSpecification *>>("QSet<QtUml::QDestructionOccurrenceSpecification *>"); - qRegisterMetaType<QDevice *>("QtUml::QDevice *"); - qRegisterMetaType<QList<QDevice *>>("QList<QtUml::QDevice *>"); - qRegisterMetaType<QSet<QDevice *>>("QSet<QtUml::QDevice *>"); - qRegisterMetaType<QDirectedRelationship *>("QtUml::QDirectedRelationship *"); - qRegisterMetaType<QList<QDirectedRelationship *>>("QList<QtUml::QDirectedRelationship *>"); - qRegisterMetaType<QSet<QDirectedRelationship *>>("QSet<QtUml::QDirectedRelationship *>"); - qRegisterMetaType<QDuration *>("QtUml::QDuration *"); - qRegisterMetaType<QList<QDuration *>>("QList<QtUml::QDuration *>"); - qRegisterMetaType<QSet<QDuration *>>("QSet<QtUml::QDuration *>"); - qRegisterMetaType<QDurationConstraint *>("QtUml::QDurationConstraint *"); - qRegisterMetaType<QList<QDurationConstraint *>>("QList<QtUml::QDurationConstraint *>"); - qRegisterMetaType<QSet<QDurationConstraint *>>("QSet<QtUml::QDurationConstraint *>"); - qRegisterMetaType<QDurationInterval *>("QtUml::QDurationInterval *"); - qRegisterMetaType<QList<QDurationInterval *>>("QList<QtUml::QDurationInterval *>"); - qRegisterMetaType<QSet<QDurationInterval *>>("QSet<QtUml::QDurationInterval *>"); - qRegisterMetaType<QDurationObservation *>("QtUml::QDurationObservation *"); - qRegisterMetaType<QList<QDurationObservation *>>("QList<QtUml::QDurationObservation *>"); - qRegisterMetaType<QSet<QDurationObservation *>>("QSet<QtUml::QDurationObservation *>"); - qRegisterMetaType<QElement *>("QtUml::QElement *"); - qRegisterMetaType<QList<QElement *>>("QList<QtUml::QElement *>"); - qRegisterMetaType<QSet<QElement *>>("QSet<QtUml::QElement *>"); - qRegisterMetaType<QElementImport *>("QtUml::QElementImport *"); - qRegisterMetaType<QList<QElementImport *>>("QList<QtUml::QElementImport *>"); - qRegisterMetaType<QSet<QElementImport *>>("QSet<QtUml::QElementImport *>"); - qRegisterMetaType<QEncapsulatedClassifier *>("QtUml::QEncapsulatedClassifier *"); - qRegisterMetaType<QList<QEncapsulatedClassifier *>>("QList<QtUml::QEncapsulatedClassifier *>"); - qRegisterMetaType<QSet<QEncapsulatedClassifier *>>("QSet<QtUml::QEncapsulatedClassifier *>"); - qRegisterMetaType<QEnumeration *>("QtUml::QEnumeration *"); - qRegisterMetaType<QList<QEnumeration *>>("QList<QtUml::QEnumeration *>"); - qRegisterMetaType<QSet<QEnumeration *>>("QSet<QtUml::QEnumeration *>"); - qRegisterMetaType<QEnumerationLiteral *>("QtUml::QEnumerationLiteral *"); - qRegisterMetaType<QList<QEnumerationLiteral *>>("QList<QtUml::QEnumerationLiteral *>"); - qRegisterMetaType<QSet<QEnumerationLiteral *>>("QSet<QtUml::QEnumerationLiteral *>"); - qRegisterMetaType<QEvent *>("QtUml::QEvent *"); - qRegisterMetaType<QList<QEvent *>>("QList<QtUml::QEvent *>"); - qRegisterMetaType<QSet<QEvent *>>("QSet<QtUml::QEvent *>"); - qRegisterMetaType<QExceptionHandler *>("QtUml::QExceptionHandler *"); - qRegisterMetaType<QList<QExceptionHandler *>>("QList<QtUml::QExceptionHandler *>"); - qRegisterMetaType<QSet<QExceptionHandler *>>("QSet<QtUml::QExceptionHandler *>"); - qRegisterMetaType<QExecutableNode *>("QtUml::QExecutableNode *"); - qRegisterMetaType<QList<QExecutableNode *>>("QList<QtUml::QExecutableNode *>"); - qRegisterMetaType<QSet<QExecutableNode *>>("QSet<QtUml::QExecutableNode *>"); - qRegisterMetaType<QExecutionEnvironment *>("QtUml::QExecutionEnvironment *"); - qRegisterMetaType<QList<QExecutionEnvironment *>>("QList<QtUml::QExecutionEnvironment *>"); - qRegisterMetaType<QSet<QExecutionEnvironment *>>("QSet<QtUml::QExecutionEnvironment *>"); - qRegisterMetaType<QExecutionOccurrenceSpecification *>("QtUml::QExecutionOccurrenceSpecification *"); - qRegisterMetaType<QList<QExecutionOccurrenceSpecification *>>("QList<QtUml::QExecutionOccurrenceSpecification *>"); - qRegisterMetaType<QSet<QExecutionOccurrenceSpecification *>>("QSet<QtUml::QExecutionOccurrenceSpecification *>"); - qRegisterMetaType<QExecutionSpecification *>("QtUml::QExecutionSpecification *"); - qRegisterMetaType<QList<QExecutionSpecification *>>("QList<QtUml::QExecutionSpecification *>"); - qRegisterMetaType<QSet<QExecutionSpecification *>>("QSet<QtUml::QExecutionSpecification *>"); - qRegisterMetaType<QExpansionNode *>("QtUml::QExpansionNode *"); - qRegisterMetaType<QList<QExpansionNode *>>("QList<QtUml::QExpansionNode *>"); - qRegisterMetaType<QSet<QExpansionNode *>>("QSet<QtUml::QExpansionNode *>"); - qRegisterMetaType<QExpansionRegion *>("QtUml::QExpansionRegion *"); - qRegisterMetaType<QList<QExpansionRegion *>>("QList<QtUml::QExpansionRegion *>"); - qRegisterMetaType<QSet<QExpansionRegion *>>("QSet<QtUml::QExpansionRegion *>"); - qRegisterMetaType<QExpression *>("QtUml::QExpression *"); - qRegisterMetaType<QList<QExpression *>>("QList<QtUml::QExpression *>"); - qRegisterMetaType<QSet<QExpression *>>("QSet<QtUml::QExpression *>"); - qRegisterMetaType<QExtend *>("QtUml::QExtend *"); - qRegisterMetaType<QList<QExtend *>>("QList<QtUml::QExtend *>"); - qRegisterMetaType<QSet<QExtend *>>("QSet<QtUml::QExtend *>"); - qRegisterMetaType<QExtension *>("QtUml::QExtension *"); - qRegisterMetaType<QList<QExtension *>>("QList<QtUml::QExtension *>"); - qRegisterMetaType<QSet<QExtension *>>("QSet<QtUml::QExtension *>"); - qRegisterMetaType<QExtensionEnd *>("QtUml::QExtensionEnd *"); - qRegisterMetaType<QList<QExtensionEnd *>>("QList<QtUml::QExtensionEnd *>"); - qRegisterMetaType<QSet<QExtensionEnd *>>("QSet<QtUml::QExtensionEnd *>"); - qRegisterMetaType<QExtensionPoint *>("QtUml::QExtensionPoint *"); - qRegisterMetaType<QList<QExtensionPoint *>>("QList<QtUml::QExtensionPoint *>"); - qRegisterMetaType<QSet<QExtensionPoint *>>("QSet<QtUml::QExtensionPoint *>"); - qRegisterMetaType<QFeature *>("QtUml::QFeature *"); - qRegisterMetaType<QList<QFeature *>>("QList<QtUml::QFeature *>"); - qRegisterMetaType<QSet<QFeature *>>("QSet<QtUml::QFeature *>"); - qRegisterMetaType<QFinalNode *>("QtUml::QFinalNode *"); - qRegisterMetaType<QList<QFinalNode *>>("QList<QtUml::QFinalNode *>"); - qRegisterMetaType<QSet<QFinalNode *>>("QSet<QtUml::QFinalNode *>"); - qRegisterMetaType<QFinalState *>("QtUml::QFinalState *"); - qRegisterMetaType<QList<QFinalState *>>("QList<QtUml::QFinalState *>"); - qRegisterMetaType<QSet<QFinalState *>>("QSet<QtUml::QFinalState *>"); - qRegisterMetaType<QFlowFinalNode *>("QtUml::QFlowFinalNode *"); - qRegisterMetaType<QList<QFlowFinalNode *>>("QList<QtUml::QFlowFinalNode *>"); - qRegisterMetaType<QSet<QFlowFinalNode *>>("QSet<QtUml::QFlowFinalNode *>"); - qRegisterMetaType<QForkNode *>("QtUml::QForkNode *"); - qRegisterMetaType<QList<QForkNode *>>("QList<QtUml::QForkNode *>"); - qRegisterMetaType<QSet<QForkNode *>>("QSet<QtUml::QForkNode *>"); - qRegisterMetaType<QFunctionBehavior *>("QtUml::QFunctionBehavior *"); - qRegisterMetaType<QList<QFunctionBehavior *>>("QList<QtUml::QFunctionBehavior *>"); - qRegisterMetaType<QSet<QFunctionBehavior *>>("QSet<QtUml::QFunctionBehavior *>"); - qRegisterMetaType<QGate *>("QtUml::QGate *"); - qRegisterMetaType<QList<QGate *>>("QList<QtUml::QGate *>"); - qRegisterMetaType<QSet<QGate *>>("QSet<QtUml::QGate *>"); - qRegisterMetaType<QGeneralization *>("QtUml::QGeneralization *"); - qRegisterMetaType<QList<QGeneralization *>>("QList<QtUml::QGeneralization *>"); - qRegisterMetaType<QSet<QGeneralization *>>("QSet<QtUml::QGeneralization *>"); - qRegisterMetaType<QGeneralizationSet *>("QtUml::QGeneralizationSet *"); - qRegisterMetaType<QList<QGeneralizationSet *>>("QList<QtUml::QGeneralizationSet *>"); - qRegisterMetaType<QSet<QGeneralizationSet *>>("QSet<QtUml::QGeneralizationSet *>"); - qRegisterMetaType<QGeneralOrdering *>("QtUml::QGeneralOrdering *"); - qRegisterMetaType<QList<QGeneralOrdering *>>("QList<QtUml::QGeneralOrdering *>"); - qRegisterMetaType<QSet<QGeneralOrdering *>>("QSet<QtUml::QGeneralOrdering *>"); - qRegisterMetaType<QImage *>("QtUml::QImage *"); - qRegisterMetaType<QList<QImage *>>("QList<QtUml::QImage *>"); - qRegisterMetaType<QSet<QImage *>>("QSet<QtUml::QImage *>"); - qRegisterMetaType<QInclude *>("QtUml::QInclude *"); - qRegisterMetaType<QList<QInclude *>>("QList<QtUml::QInclude *>"); - qRegisterMetaType<QSet<QInclude *>>("QSet<QtUml::QInclude *>"); - qRegisterMetaType<QInformationFlow *>("QtUml::QInformationFlow *"); - qRegisterMetaType<QList<QInformationFlow *>>("QList<QtUml::QInformationFlow *>"); - qRegisterMetaType<QSet<QInformationFlow *>>("QSet<QtUml::QInformationFlow *>"); - qRegisterMetaType<QInformationItem *>("QtUml::QInformationItem *"); - qRegisterMetaType<QList<QInformationItem *>>("QList<QtUml::QInformationItem *>"); - qRegisterMetaType<QSet<QInformationItem *>>("QSet<QtUml::QInformationItem *>"); - qRegisterMetaType<QInitialNode *>("QtUml::QInitialNode *"); - qRegisterMetaType<QList<QInitialNode *>>("QList<QtUml::QInitialNode *>"); - qRegisterMetaType<QSet<QInitialNode *>>("QSet<QtUml::QInitialNode *>"); - qRegisterMetaType<QInputPin *>("QtUml::QInputPin *"); - qRegisterMetaType<QList<QInputPin *>>("QList<QtUml::QInputPin *>"); - qRegisterMetaType<QSet<QInputPin *>>("QSet<QtUml::QInputPin *>"); - qRegisterMetaType<QInstanceSpecification *>("QtUml::QInstanceSpecification *"); - qRegisterMetaType<QList<QInstanceSpecification *>>("QList<QtUml::QInstanceSpecification *>"); - qRegisterMetaType<QSet<QInstanceSpecification *>>("QSet<QtUml::QInstanceSpecification *>"); - qRegisterMetaType<QInstanceValue *>("QtUml::QInstanceValue *"); - qRegisterMetaType<QList<QInstanceValue *>>("QList<QtUml::QInstanceValue *>"); - qRegisterMetaType<QSet<QInstanceValue *>>("QSet<QtUml::QInstanceValue *>"); - qRegisterMetaType<QInteraction *>("QtUml::QInteraction *"); - qRegisterMetaType<QList<QInteraction *>>("QList<QtUml::QInteraction *>"); - qRegisterMetaType<QSet<QInteraction *>>("QSet<QtUml::QInteraction *>"); - qRegisterMetaType<QInteractionConstraint *>("QtUml::QInteractionConstraint *"); - qRegisterMetaType<QList<QInteractionConstraint *>>("QList<QtUml::QInteractionConstraint *>"); - qRegisterMetaType<QSet<QInteractionConstraint *>>("QSet<QtUml::QInteractionConstraint *>"); - qRegisterMetaType<QInteractionFragment *>("QtUml::QInteractionFragment *"); - qRegisterMetaType<QList<QInteractionFragment *>>("QList<QtUml::QInteractionFragment *>"); - qRegisterMetaType<QSet<QInteractionFragment *>>("QSet<QtUml::QInteractionFragment *>"); - qRegisterMetaType<QInteractionOperand *>("QtUml::QInteractionOperand *"); - qRegisterMetaType<QList<QInteractionOperand *>>("QList<QtUml::QInteractionOperand *>"); - qRegisterMetaType<QSet<QInteractionOperand *>>("QSet<QtUml::QInteractionOperand *>"); - qRegisterMetaType<QInteractionUse *>("QtUml::QInteractionUse *"); - qRegisterMetaType<QList<QInteractionUse *>>("QList<QtUml::QInteractionUse *>"); - qRegisterMetaType<QSet<QInteractionUse *>>("QSet<QtUml::QInteractionUse *>"); - qRegisterMetaType<QInterface *>("QtUml::QInterface *"); - qRegisterMetaType<QList<QInterface *>>("QList<QtUml::QInterface *>"); - qRegisterMetaType<QSet<QInterface *>>("QSet<QtUml::QInterface *>"); - qRegisterMetaType<QInterfaceRealization *>("QtUml::QInterfaceRealization *"); - qRegisterMetaType<QList<QInterfaceRealization *>>("QList<QtUml::QInterfaceRealization *>"); - qRegisterMetaType<QSet<QInterfaceRealization *>>("QSet<QtUml::QInterfaceRealization *>"); - qRegisterMetaType<QInterruptibleActivityRegion *>("QtUml::QInterruptibleActivityRegion *"); - qRegisterMetaType<QList<QInterruptibleActivityRegion *>>("QList<QtUml::QInterruptibleActivityRegion *>"); - qRegisterMetaType<QSet<QInterruptibleActivityRegion *>>("QSet<QtUml::QInterruptibleActivityRegion *>"); - qRegisterMetaType<QInterval *>("QtUml::QInterval *"); - qRegisterMetaType<QList<QInterval *>>("QList<QtUml::QInterval *>"); - qRegisterMetaType<QSet<QInterval *>>("QSet<QtUml::QInterval *>"); - qRegisterMetaType<QIntervalConstraint *>("QtUml::QIntervalConstraint *"); - qRegisterMetaType<QList<QIntervalConstraint *>>("QList<QtUml::QIntervalConstraint *>"); - qRegisterMetaType<QSet<QIntervalConstraint *>>("QSet<QtUml::QIntervalConstraint *>"); - qRegisterMetaType<QInvocationAction *>("QtUml::QInvocationAction *"); - qRegisterMetaType<QList<QInvocationAction *>>("QList<QtUml::QInvocationAction *>"); - qRegisterMetaType<QSet<QInvocationAction *>>("QSet<QtUml::QInvocationAction *>"); - qRegisterMetaType<QJoinNode *>("QtUml::QJoinNode *"); - qRegisterMetaType<QList<QJoinNode *>>("QList<QtUml::QJoinNode *>"); - qRegisterMetaType<QSet<QJoinNode *>>("QSet<QtUml::QJoinNode *>"); - qRegisterMetaType<QLifeline *>("QtUml::QLifeline *"); - qRegisterMetaType<QList<QLifeline *>>("QList<QtUml::QLifeline *>"); - qRegisterMetaType<QSet<QLifeline *>>("QSet<QtUml::QLifeline *>"); - qRegisterMetaType<QLinkAction *>("QtUml::QLinkAction *"); - qRegisterMetaType<QList<QLinkAction *>>("QList<QtUml::QLinkAction *>"); - qRegisterMetaType<QSet<QLinkAction *>>("QSet<QtUml::QLinkAction *>"); - qRegisterMetaType<QLinkEndCreationData *>("QtUml::QLinkEndCreationData *"); - qRegisterMetaType<QList<QLinkEndCreationData *>>("QList<QtUml::QLinkEndCreationData *>"); - qRegisterMetaType<QSet<QLinkEndCreationData *>>("QSet<QtUml::QLinkEndCreationData *>"); - qRegisterMetaType<QLinkEndData *>("QtUml::QLinkEndData *"); - qRegisterMetaType<QList<QLinkEndData *>>("QList<QtUml::QLinkEndData *>"); - qRegisterMetaType<QSet<QLinkEndData *>>("QSet<QtUml::QLinkEndData *>"); - qRegisterMetaType<QLinkEndDestructionData *>("QtUml::QLinkEndDestructionData *"); - qRegisterMetaType<QList<QLinkEndDestructionData *>>("QList<QtUml::QLinkEndDestructionData *>"); - qRegisterMetaType<QSet<QLinkEndDestructionData *>>("QSet<QtUml::QLinkEndDestructionData *>"); - qRegisterMetaType<QLiteralBoolean *>("QtUml::QLiteralBoolean *"); - qRegisterMetaType<QList<QLiteralBoolean *>>("QList<QtUml::QLiteralBoolean *>"); - qRegisterMetaType<QSet<QLiteralBoolean *>>("QSet<QtUml::QLiteralBoolean *>"); - qRegisterMetaType<QLiteralInteger *>("QtUml::QLiteralInteger *"); - qRegisterMetaType<QList<QLiteralInteger *>>("QList<QtUml::QLiteralInteger *>"); - qRegisterMetaType<QSet<QLiteralInteger *>>("QSet<QtUml::QLiteralInteger *>"); - qRegisterMetaType<QLiteralNull *>("QtUml::QLiteralNull *"); - qRegisterMetaType<QList<QLiteralNull *>>("QList<QtUml::QLiteralNull *>"); - qRegisterMetaType<QSet<QLiteralNull *>>("QSet<QtUml::QLiteralNull *>"); - qRegisterMetaType<QLiteralReal *>("QtUml::QLiteralReal *"); - qRegisterMetaType<QList<QLiteralReal *>>("QList<QtUml::QLiteralReal *>"); - qRegisterMetaType<QSet<QLiteralReal *>>("QSet<QtUml::QLiteralReal *>"); - qRegisterMetaType<QLiteralSpecification *>("QtUml::QLiteralSpecification *"); - qRegisterMetaType<QList<QLiteralSpecification *>>("QList<QtUml::QLiteralSpecification *>"); - qRegisterMetaType<QSet<QLiteralSpecification *>>("QSet<QtUml::QLiteralSpecification *>"); - qRegisterMetaType<QLiteralString *>("QtUml::QLiteralString *"); - qRegisterMetaType<QList<QLiteralString *>>("QList<QtUml::QLiteralString *>"); - qRegisterMetaType<QSet<QLiteralString *>>("QSet<QtUml::QLiteralString *>"); - qRegisterMetaType<QLiteralUnlimitedNatural *>("QtUml::QLiteralUnlimitedNatural *"); - qRegisterMetaType<QList<QLiteralUnlimitedNatural *>>("QList<QtUml::QLiteralUnlimitedNatural *>"); - qRegisterMetaType<QSet<QLiteralUnlimitedNatural *>>("QSet<QtUml::QLiteralUnlimitedNatural *>"); - qRegisterMetaType<QLoopNode *>("QtUml::QLoopNode *"); - qRegisterMetaType<QList<QLoopNode *>>("QList<QtUml::QLoopNode *>"); - qRegisterMetaType<QSet<QLoopNode *>>("QSet<QtUml::QLoopNode *>"); - qRegisterMetaType<QManifestation *>("QtUml::QManifestation *"); - qRegisterMetaType<QList<QManifestation *>>("QList<QtUml::QManifestation *>"); - qRegisterMetaType<QSet<QManifestation *>>("QSet<QtUml::QManifestation *>"); - qRegisterMetaType<QMergeNode *>("QtUml::QMergeNode *"); - qRegisterMetaType<QList<QMergeNode *>>("QList<QtUml::QMergeNode *>"); - qRegisterMetaType<QSet<QMergeNode *>>("QSet<QtUml::QMergeNode *>"); - qRegisterMetaType<QMessage *>("QtUml::QMessage *"); - qRegisterMetaType<QList<QMessage *>>("QList<QtUml::QMessage *>"); - qRegisterMetaType<QSet<QMessage *>>("QSet<QtUml::QMessage *>"); - qRegisterMetaType<QMessageEnd *>("QtUml::QMessageEnd *"); - qRegisterMetaType<QList<QMessageEnd *>>("QList<QtUml::QMessageEnd *>"); - qRegisterMetaType<QSet<QMessageEnd *>>("QSet<QtUml::QMessageEnd *>"); - qRegisterMetaType<QMessageEvent *>("QtUml::QMessageEvent *"); - qRegisterMetaType<QList<QMessageEvent *>>("QList<QtUml::QMessageEvent *>"); - qRegisterMetaType<QSet<QMessageEvent *>>("QSet<QtUml::QMessageEvent *>"); - qRegisterMetaType<QMessageOccurrenceSpecification *>("QtUml::QMessageOccurrenceSpecification *"); - qRegisterMetaType<QList<QMessageOccurrenceSpecification *>>("QList<QtUml::QMessageOccurrenceSpecification *>"); - qRegisterMetaType<QSet<QMessageOccurrenceSpecification *>>("QSet<QtUml::QMessageOccurrenceSpecification *>"); - qRegisterMetaType<QModel *>("QtUml::QModel *"); - qRegisterMetaType<QList<QModel *>>("QList<QtUml::QModel *>"); - qRegisterMetaType<QSet<QModel *>>("QSet<QtUml::QModel *>"); - qRegisterMetaType<QMultiplicityElement *>("QtUml::QMultiplicityElement *"); - qRegisterMetaType<QList<QMultiplicityElement *>>("QList<QtUml::QMultiplicityElement *>"); - qRegisterMetaType<QSet<QMultiplicityElement *>>("QSet<QtUml::QMultiplicityElement *>"); - qRegisterMetaType<QNamedElement *>("QtUml::QNamedElement *"); - qRegisterMetaType<QList<QNamedElement *>>("QList<QtUml::QNamedElement *>"); - qRegisterMetaType<QSet<QNamedElement *>>("QSet<QtUml::QNamedElement *>"); - qRegisterMetaType<QNamespace *>("QtUml::QNamespace *"); - qRegisterMetaType<QList<QNamespace *>>("QList<QtUml::QNamespace *>"); - qRegisterMetaType<QSet<QNamespace *>>("QSet<QtUml::QNamespace *>"); - qRegisterMetaType<QNode *>("QtUml::QNode *"); - qRegisterMetaType<QList<QNode *>>("QList<QtUml::QNode *>"); - qRegisterMetaType<QSet<QNode *>>("QSet<QtUml::QNode *>"); - qRegisterMetaType<QObjectFlow *>("QtUml::QObjectFlow *"); - qRegisterMetaType<QList<QObjectFlow *>>("QList<QtUml::QObjectFlow *>"); - qRegisterMetaType<QSet<QObjectFlow *>>("QSet<QtUml::QObjectFlow *>"); - qRegisterMetaType<QObjectNode *>("QtUml::QObjectNode *"); - qRegisterMetaType<QList<QObjectNode *>>("QList<QtUml::QObjectNode *>"); - qRegisterMetaType<QSet<QObjectNode *>>("QSet<QtUml::QObjectNode *>"); - qRegisterMetaType<QObservation *>("QtUml::QObservation *"); - qRegisterMetaType<QList<QObservation *>>("QList<QtUml::QObservation *>"); - qRegisterMetaType<QSet<QObservation *>>("QSet<QtUml::QObservation *>"); - qRegisterMetaType<QOccurrenceSpecification *>("QtUml::QOccurrenceSpecification *"); - qRegisterMetaType<QList<QOccurrenceSpecification *>>("QList<QtUml::QOccurrenceSpecification *>"); - qRegisterMetaType<QSet<QOccurrenceSpecification *>>("QSet<QtUml::QOccurrenceSpecification *>"); - qRegisterMetaType<QOpaqueAction *>("QtUml::QOpaqueAction *"); - qRegisterMetaType<QList<QOpaqueAction *>>("QList<QtUml::QOpaqueAction *>"); - qRegisterMetaType<QSet<QOpaqueAction *>>("QSet<QtUml::QOpaqueAction *>"); - qRegisterMetaType<QOpaqueBehavior *>("QtUml::QOpaqueBehavior *"); - qRegisterMetaType<QList<QOpaqueBehavior *>>("QList<QtUml::QOpaqueBehavior *>"); - qRegisterMetaType<QSet<QOpaqueBehavior *>>("QSet<QtUml::QOpaqueBehavior *>"); - qRegisterMetaType<QOpaqueExpression *>("QtUml::QOpaqueExpression *"); - qRegisterMetaType<QList<QOpaqueExpression *>>("QList<QtUml::QOpaqueExpression *>"); - qRegisterMetaType<QSet<QOpaqueExpression *>>("QSet<QtUml::QOpaqueExpression *>"); - qRegisterMetaType<QOperation *>("QtUml::QOperation *"); - qRegisterMetaType<QList<QOperation *>>("QList<QtUml::QOperation *>"); - qRegisterMetaType<QSet<QOperation *>>("QSet<QtUml::QOperation *>"); - qRegisterMetaType<QOperationTemplateParameter *>("QtUml::QOperationTemplateParameter *"); - qRegisterMetaType<QList<QOperationTemplateParameter *>>("QList<QtUml::QOperationTemplateParameter *>"); - qRegisterMetaType<QSet<QOperationTemplateParameter *>>("QSet<QtUml::QOperationTemplateParameter *>"); - qRegisterMetaType<QOutputPin *>("QtUml::QOutputPin *"); - qRegisterMetaType<QList<QOutputPin *>>("QList<QtUml::QOutputPin *>"); - qRegisterMetaType<QSet<QOutputPin *>>("QSet<QtUml::QOutputPin *>"); - qRegisterMetaType<QPackage *>("QtUml::QPackage *"); - qRegisterMetaType<QList<QPackage *>>("QList<QtUml::QPackage *>"); - qRegisterMetaType<QSet<QPackage *>>("QSet<QtUml::QPackage *>"); - qRegisterMetaType<QPackageableElement *>("QtUml::QPackageableElement *"); - qRegisterMetaType<QList<QPackageableElement *>>("QList<QtUml::QPackageableElement *>"); - qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QtUml::QPackageableElement *>"); - qRegisterMetaType<QPackageImport *>("QtUml::QPackageImport *"); - qRegisterMetaType<QList<QPackageImport *>>("QList<QtUml::QPackageImport *>"); - qRegisterMetaType<QSet<QPackageImport *>>("QSet<QtUml::QPackageImport *>"); - qRegisterMetaType<QPackageMerge *>("QtUml::QPackageMerge *"); - qRegisterMetaType<QList<QPackageMerge *>>("QList<QtUml::QPackageMerge *>"); - qRegisterMetaType<QSet<QPackageMerge *>>("QSet<QtUml::QPackageMerge *>"); - qRegisterMetaType<QParameter *>("QtUml::QParameter *"); - qRegisterMetaType<QList<QParameter *>>("QList<QtUml::QParameter *>"); - qRegisterMetaType<QSet<QParameter *>>("QSet<QtUml::QParameter *>"); - qRegisterMetaType<QParameterableElement *>("QtUml::QParameterableElement *"); - qRegisterMetaType<QList<QParameterableElement *>>("QList<QtUml::QParameterableElement *>"); - qRegisterMetaType<QSet<QParameterableElement *>>("QSet<QtUml::QParameterableElement *>"); - qRegisterMetaType<QParameterSet *>("QtUml::QParameterSet *"); - qRegisterMetaType<QList<QParameterSet *>>("QList<QtUml::QParameterSet *>"); - qRegisterMetaType<QSet<QParameterSet *>>("QSet<QtUml::QParameterSet *>"); - qRegisterMetaType<QPartDecomposition *>("QtUml::QPartDecomposition *"); - qRegisterMetaType<QList<QPartDecomposition *>>("QList<QtUml::QPartDecomposition *>"); - qRegisterMetaType<QSet<QPartDecomposition *>>("QSet<QtUml::QPartDecomposition *>"); - qRegisterMetaType<QPin *>("QtUml::QPin *"); - qRegisterMetaType<QList<QPin *>>("QList<QtUml::QPin *>"); - qRegisterMetaType<QSet<QPin *>>("QSet<QtUml::QPin *>"); - qRegisterMetaType<QPort *>("QtUml::QPort *"); - qRegisterMetaType<QList<QPort *>>("QList<QtUml::QPort *>"); - qRegisterMetaType<QSet<QPort *>>("QSet<QtUml::QPort *>"); - qRegisterMetaType<QPrimitiveType *>("QtUml::QPrimitiveType *"); - qRegisterMetaType<QList<QPrimitiveType *>>("QList<QtUml::QPrimitiveType *>"); - qRegisterMetaType<QSet<QPrimitiveType *>>("QSet<QtUml::QPrimitiveType *>"); - qRegisterMetaType<QProfile *>("QtUml::QProfile *"); - qRegisterMetaType<QList<QProfile *>>("QList<QtUml::QProfile *>"); - qRegisterMetaType<QSet<QProfile *>>("QSet<QtUml::QProfile *>"); - qRegisterMetaType<QProfileApplication *>("QtUml::QProfileApplication *"); - qRegisterMetaType<QList<QProfileApplication *>>("QList<QtUml::QProfileApplication *>"); - qRegisterMetaType<QSet<QProfileApplication *>>("QSet<QtUml::QProfileApplication *>"); - qRegisterMetaType<QProperty *>("QtUml::QProperty *"); - qRegisterMetaType<QList<QProperty *>>("QList<QtUml::QProperty *>"); - qRegisterMetaType<QSet<QProperty *>>("QSet<QtUml::QProperty *>"); - qRegisterMetaType<QProtocolConformance *>("QtUml::QProtocolConformance *"); - qRegisterMetaType<QList<QProtocolConformance *>>("QList<QtUml::QProtocolConformance *>"); - qRegisterMetaType<QSet<QProtocolConformance *>>("QSet<QtUml::QProtocolConformance *>"); - qRegisterMetaType<QProtocolStateMachine *>("QtUml::QProtocolStateMachine *"); - qRegisterMetaType<QList<QProtocolStateMachine *>>("QList<QtUml::QProtocolStateMachine *>"); - qRegisterMetaType<QSet<QProtocolStateMachine *>>("QSet<QtUml::QProtocolStateMachine *>"); - qRegisterMetaType<QProtocolTransition *>("QtUml::QProtocolTransition *"); - qRegisterMetaType<QList<QProtocolTransition *>>("QList<QtUml::QProtocolTransition *>"); - qRegisterMetaType<QSet<QProtocolTransition *>>("QSet<QtUml::QProtocolTransition *>"); - qRegisterMetaType<QPseudostate *>("QtUml::QPseudostate *"); - qRegisterMetaType<QList<QPseudostate *>>("QList<QtUml::QPseudostate *>"); - qRegisterMetaType<QSet<QPseudostate *>>("QSet<QtUml::QPseudostate *>"); - qRegisterMetaType<QQualifierValue *>("QtUml::QQualifierValue *"); - qRegisterMetaType<QList<QQualifierValue *>>("QList<QtUml::QQualifierValue *>"); - qRegisterMetaType<QSet<QQualifierValue *>>("QSet<QtUml::QQualifierValue *>"); - qRegisterMetaType<QRaiseExceptionAction *>("QtUml::QRaiseExceptionAction *"); - qRegisterMetaType<QList<QRaiseExceptionAction *>>("QList<QtUml::QRaiseExceptionAction *>"); - qRegisterMetaType<QSet<QRaiseExceptionAction *>>("QSet<QtUml::QRaiseExceptionAction *>"); - qRegisterMetaType<QReadExtentAction *>("QtUml::QReadExtentAction *"); - qRegisterMetaType<QList<QReadExtentAction *>>("QList<QtUml::QReadExtentAction *>"); - qRegisterMetaType<QSet<QReadExtentAction *>>("QSet<QtUml::QReadExtentAction *>"); - qRegisterMetaType<QReadIsClassifiedObjectAction *>("QtUml::QReadIsClassifiedObjectAction *"); - qRegisterMetaType<QList<QReadIsClassifiedObjectAction *>>("QList<QtUml::QReadIsClassifiedObjectAction *>"); - qRegisterMetaType<QSet<QReadIsClassifiedObjectAction *>>("QSet<QtUml::QReadIsClassifiedObjectAction *>"); - qRegisterMetaType<QReadLinkAction *>("QtUml::QReadLinkAction *"); - qRegisterMetaType<QList<QReadLinkAction *>>("QList<QtUml::QReadLinkAction *>"); - qRegisterMetaType<QSet<QReadLinkAction *>>("QSet<QtUml::QReadLinkAction *>"); - qRegisterMetaType<QReadLinkObjectEndAction *>("QtUml::QReadLinkObjectEndAction *"); - qRegisterMetaType<QList<QReadLinkObjectEndAction *>>("QList<QtUml::QReadLinkObjectEndAction *>"); - qRegisterMetaType<QSet<QReadLinkObjectEndAction *>>("QSet<QtUml::QReadLinkObjectEndAction *>"); - qRegisterMetaType<QReadLinkObjectEndQualifierAction *>("QtUml::QReadLinkObjectEndQualifierAction *"); - qRegisterMetaType<QList<QReadLinkObjectEndQualifierAction *>>("QList<QtUml::QReadLinkObjectEndQualifierAction *>"); - qRegisterMetaType<QSet<QReadLinkObjectEndQualifierAction *>>("QSet<QtUml::QReadLinkObjectEndQualifierAction *>"); - qRegisterMetaType<QReadSelfAction *>("QtUml::QReadSelfAction *"); - qRegisterMetaType<QList<QReadSelfAction *>>("QList<QtUml::QReadSelfAction *>"); - qRegisterMetaType<QSet<QReadSelfAction *>>("QSet<QtUml::QReadSelfAction *>"); - qRegisterMetaType<QReadStructuralFeatureAction *>("QtUml::QReadStructuralFeatureAction *"); - qRegisterMetaType<QList<QReadStructuralFeatureAction *>>("QList<QtUml::QReadStructuralFeatureAction *>"); - qRegisterMetaType<QSet<QReadStructuralFeatureAction *>>("QSet<QtUml::QReadStructuralFeatureAction *>"); - qRegisterMetaType<QReadVariableAction *>("QtUml::QReadVariableAction *"); - qRegisterMetaType<QList<QReadVariableAction *>>("QList<QtUml::QReadVariableAction *>"); - qRegisterMetaType<QSet<QReadVariableAction *>>("QSet<QtUml::QReadVariableAction *>"); - qRegisterMetaType<QRealization *>("QtUml::QRealization *"); - qRegisterMetaType<QList<QRealization *>>("QList<QtUml::QRealization *>"); - qRegisterMetaType<QSet<QRealization *>>("QSet<QtUml::QRealization *>"); - qRegisterMetaType<QReception *>("QtUml::QReception *"); - qRegisterMetaType<QList<QReception *>>("QList<QtUml::QReception *>"); - qRegisterMetaType<QSet<QReception *>>("QSet<QtUml::QReception *>"); - qRegisterMetaType<QReclassifyObjectAction *>("QtUml::QReclassifyObjectAction *"); - qRegisterMetaType<QList<QReclassifyObjectAction *>>("QList<QtUml::QReclassifyObjectAction *>"); - qRegisterMetaType<QSet<QReclassifyObjectAction *>>("QSet<QtUml::QReclassifyObjectAction *>"); - qRegisterMetaType<QRedefinableElement *>("QtUml::QRedefinableElement *"); - qRegisterMetaType<QList<QRedefinableElement *>>("QList<QtUml::QRedefinableElement *>"); - qRegisterMetaType<QSet<QRedefinableElement *>>("QSet<QtUml::QRedefinableElement *>"); - qRegisterMetaType<QRedefinableTemplateSignature *>("QtUml::QRedefinableTemplateSignature *"); - qRegisterMetaType<QList<QRedefinableTemplateSignature *>>("QList<QtUml::QRedefinableTemplateSignature *>"); - qRegisterMetaType<QSet<QRedefinableTemplateSignature *>>("QSet<QtUml::QRedefinableTemplateSignature *>"); - qRegisterMetaType<QReduceAction *>("QtUml::QReduceAction *"); - qRegisterMetaType<QList<QReduceAction *>>("QList<QtUml::QReduceAction *>"); - qRegisterMetaType<QSet<QReduceAction *>>("QSet<QtUml::QReduceAction *>"); - qRegisterMetaType<QRegion *>("QtUml::QRegion *"); - qRegisterMetaType<QList<QRegion *>>("QList<QtUml::QRegion *>"); - qRegisterMetaType<QSet<QRegion *>>("QSet<QtUml::QRegion *>"); - qRegisterMetaType<QRelationship *>("QtUml::QRelationship *"); - qRegisterMetaType<QList<QRelationship *>>("QList<QtUml::QRelationship *>"); - qRegisterMetaType<QSet<QRelationship *>>("QSet<QtUml::QRelationship *>"); - qRegisterMetaType<QRemoveStructuralFeatureValueAction *>("QtUml::QRemoveStructuralFeatureValueAction *"); - qRegisterMetaType<QList<QRemoveStructuralFeatureValueAction *>>("QList<QtUml::QRemoveStructuralFeatureValueAction *>"); - qRegisterMetaType<QSet<QRemoveStructuralFeatureValueAction *>>("QSet<QtUml::QRemoveStructuralFeatureValueAction *>"); - qRegisterMetaType<QRemoveVariableValueAction *>("QtUml::QRemoveVariableValueAction *"); - qRegisterMetaType<QList<QRemoveVariableValueAction *>>("QList<QtUml::QRemoveVariableValueAction *>"); - qRegisterMetaType<QSet<QRemoveVariableValueAction *>>("QSet<QtUml::QRemoveVariableValueAction *>"); - qRegisterMetaType<QReplyAction *>("QtUml::QReplyAction *"); - qRegisterMetaType<QList<QReplyAction *>>("QList<QtUml::QReplyAction *>"); - qRegisterMetaType<QSet<QReplyAction *>>("QSet<QtUml::QReplyAction *>"); - qRegisterMetaType<QSendObjectAction *>("QtUml::QSendObjectAction *"); - qRegisterMetaType<QList<QSendObjectAction *>>("QList<QtUml::QSendObjectAction *>"); - qRegisterMetaType<QSet<QSendObjectAction *>>("QSet<QtUml::QSendObjectAction *>"); - qRegisterMetaType<QSendSignalAction *>("QtUml::QSendSignalAction *"); - qRegisterMetaType<QList<QSendSignalAction *>>("QList<QtUml::QSendSignalAction *>"); - qRegisterMetaType<QSet<QSendSignalAction *>>("QSet<QtUml::QSendSignalAction *>"); - qRegisterMetaType<QSequenceNode *>("QtUml::QSequenceNode *"); - qRegisterMetaType<QList<QSequenceNode *>>("QList<QtUml::QSequenceNode *>"); - qRegisterMetaType<QSet<QSequenceNode *>>("QSet<QtUml::QSequenceNode *>"); - qRegisterMetaType<QSignal *>("QtUml::QSignal *"); - qRegisterMetaType<QList<QSignal *>>("QList<QtUml::QSignal *>"); - qRegisterMetaType<QSet<QSignal *>>("QSet<QtUml::QSignal *>"); - qRegisterMetaType<QSignalEvent *>("QtUml::QSignalEvent *"); - qRegisterMetaType<QList<QSignalEvent *>>("QList<QtUml::QSignalEvent *>"); - qRegisterMetaType<QSet<QSignalEvent *>>("QSet<QtUml::QSignalEvent *>"); - qRegisterMetaType<QSlot *>("QtUml::QSlot *"); - qRegisterMetaType<QList<QSlot *>>("QList<QtUml::QSlot *>"); - qRegisterMetaType<QSet<QSlot *>>("QSet<QtUml::QSlot *>"); - qRegisterMetaType<QStartClassifierBehaviorAction *>("QtUml::QStartClassifierBehaviorAction *"); - qRegisterMetaType<QList<QStartClassifierBehaviorAction *>>("QList<QtUml::QStartClassifierBehaviorAction *>"); - qRegisterMetaType<QSet<QStartClassifierBehaviorAction *>>("QSet<QtUml::QStartClassifierBehaviorAction *>"); - qRegisterMetaType<QStartObjectBehaviorAction *>("QtUml::QStartObjectBehaviorAction *"); - qRegisterMetaType<QList<QStartObjectBehaviorAction *>>("QList<QtUml::QStartObjectBehaviorAction *>"); - qRegisterMetaType<QSet<QStartObjectBehaviorAction *>>("QSet<QtUml::QStartObjectBehaviorAction *>"); - qRegisterMetaType<QState *>("QtUml::QState *"); - qRegisterMetaType<QList<QState *>>("QList<QtUml::QState *>"); - qRegisterMetaType<QSet<QState *>>("QSet<QtUml::QState *>"); - qRegisterMetaType<QStateInvariant *>("QtUml::QStateInvariant *"); - qRegisterMetaType<QList<QStateInvariant *>>("QList<QtUml::QStateInvariant *>"); - qRegisterMetaType<QSet<QStateInvariant *>>("QSet<QtUml::QStateInvariant *>"); - qRegisterMetaType<QStateMachine *>("QtUml::QStateMachine *"); - qRegisterMetaType<QList<QStateMachine *>>("QList<QtUml::QStateMachine *>"); - qRegisterMetaType<QSet<QStateMachine *>>("QSet<QtUml::QStateMachine *>"); - qRegisterMetaType<QStereotype *>("QtUml::QStereotype *"); - qRegisterMetaType<QList<QStereotype *>>("QList<QtUml::QStereotype *>"); - qRegisterMetaType<QSet<QStereotype *>>("QSet<QtUml::QStereotype *>"); - qRegisterMetaType<QStringExpression *>("QtUml::QStringExpression *"); - qRegisterMetaType<QList<QStringExpression *>>("QList<QtUml::QStringExpression *>"); - qRegisterMetaType<QSet<QStringExpression *>>("QSet<QtUml::QStringExpression *>"); - qRegisterMetaType<QStructuralFeature *>("QtUml::QStructuralFeature *"); - qRegisterMetaType<QList<QStructuralFeature *>>("QList<QtUml::QStructuralFeature *>"); - qRegisterMetaType<QSet<QStructuralFeature *>>("QSet<QtUml::QStructuralFeature *>"); - qRegisterMetaType<QStructuralFeatureAction *>("QtUml::QStructuralFeatureAction *"); - qRegisterMetaType<QList<QStructuralFeatureAction *>>("QList<QtUml::QStructuralFeatureAction *>"); - qRegisterMetaType<QSet<QStructuralFeatureAction *>>("QSet<QtUml::QStructuralFeatureAction *>"); - qRegisterMetaType<QStructuredActivityNode *>("QtUml::QStructuredActivityNode *"); - qRegisterMetaType<QList<QStructuredActivityNode *>>("QList<QtUml::QStructuredActivityNode *>"); - qRegisterMetaType<QSet<QStructuredActivityNode *>>("QSet<QtUml::QStructuredActivityNode *>"); - qRegisterMetaType<QStructuredClassifier *>("QtUml::QStructuredClassifier *"); - qRegisterMetaType<QList<QStructuredClassifier *>>("QList<QtUml::QStructuredClassifier *>"); - qRegisterMetaType<QSet<QStructuredClassifier *>>("QSet<QtUml::QStructuredClassifier *>"); - qRegisterMetaType<QSubstitution *>("QtUml::QSubstitution *"); - qRegisterMetaType<QList<QSubstitution *>>("QList<QtUml::QSubstitution *>"); - qRegisterMetaType<QSet<QSubstitution *>>("QSet<QtUml::QSubstitution *>"); - qRegisterMetaType<QTemplateableElement *>("QtUml::QTemplateableElement *"); - qRegisterMetaType<QList<QTemplateableElement *>>("QList<QtUml::QTemplateableElement *>"); - qRegisterMetaType<QSet<QTemplateableElement *>>("QSet<QtUml::QTemplateableElement *>"); - qRegisterMetaType<QTemplateBinding *>("QtUml::QTemplateBinding *"); - qRegisterMetaType<QList<QTemplateBinding *>>("QList<QtUml::QTemplateBinding *>"); - qRegisterMetaType<QSet<QTemplateBinding *>>("QSet<QtUml::QTemplateBinding *>"); - qRegisterMetaType<QTemplateParameter *>("QtUml::QTemplateParameter *"); - qRegisterMetaType<QList<QTemplateParameter *>>("QList<QtUml::QTemplateParameter *>"); - qRegisterMetaType<QSet<QTemplateParameter *>>("QSet<QtUml::QTemplateParameter *>"); - qRegisterMetaType<QTemplateParameterSubstitution *>("QtUml::QTemplateParameterSubstitution *"); - qRegisterMetaType<QList<QTemplateParameterSubstitution *>>("QList<QtUml::QTemplateParameterSubstitution *>"); - qRegisterMetaType<QSet<QTemplateParameterSubstitution *>>("QSet<QtUml::QTemplateParameterSubstitution *>"); - qRegisterMetaType<QTemplateSignature *>("QtUml::QTemplateSignature *"); - qRegisterMetaType<QList<QTemplateSignature *>>("QList<QtUml::QTemplateSignature *>"); - qRegisterMetaType<QSet<QTemplateSignature *>>("QSet<QtUml::QTemplateSignature *>"); - qRegisterMetaType<QTestIdentityAction *>("QtUml::QTestIdentityAction *"); - qRegisterMetaType<QList<QTestIdentityAction *>>("QList<QtUml::QTestIdentityAction *>"); - qRegisterMetaType<QSet<QTestIdentityAction *>>("QSet<QtUml::QTestIdentityAction *>"); - qRegisterMetaType<QTimeConstraint *>("QtUml::QTimeConstraint *"); - qRegisterMetaType<QList<QTimeConstraint *>>("QList<QtUml::QTimeConstraint *>"); - qRegisterMetaType<QSet<QTimeConstraint *>>("QSet<QtUml::QTimeConstraint *>"); - qRegisterMetaType<QTimeEvent *>("QtUml::QTimeEvent *"); - qRegisterMetaType<QList<QTimeEvent *>>("QList<QtUml::QTimeEvent *>"); - qRegisterMetaType<QSet<QTimeEvent *>>("QSet<QtUml::QTimeEvent *>"); - qRegisterMetaType<QTimeExpression *>("QtUml::QTimeExpression *"); - qRegisterMetaType<QList<QTimeExpression *>>("QList<QtUml::QTimeExpression *>"); - qRegisterMetaType<QSet<QTimeExpression *>>("QSet<QtUml::QTimeExpression *>"); - qRegisterMetaType<QTimeInterval *>("QtUml::QTimeInterval *"); - qRegisterMetaType<QList<QTimeInterval *>>("QList<QtUml::QTimeInterval *>"); - qRegisterMetaType<QSet<QTimeInterval *>>("QSet<QtUml::QTimeInterval *>"); - qRegisterMetaType<QTimeObservation *>("QtUml::QTimeObservation *"); - qRegisterMetaType<QList<QTimeObservation *>>("QList<QtUml::QTimeObservation *>"); - qRegisterMetaType<QSet<QTimeObservation *>>("QSet<QtUml::QTimeObservation *>"); - qRegisterMetaType<QTransition *>("QtUml::QTransition *"); - qRegisterMetaType<QList<QTransition *>>("QList<QtUml::QTransition *>"); - qRegisterMetaType<QSet<QTransition *>>("QSet<QtUml::QTransition *>"); - qRegisterMetaType<QTrigger *>("QtUml::QTrigger *"); - qRegisterMetaType<QList<QTrigger *>>("QList<QtUml::QTrigger *>"); - qRegisterMetaType<QSet<QTrigger *>>("QSet<QtUml::QTrigger *>"); - qRegisterMetaType<QType *>("QtUml::QType *"); - qRegisterMetaType<QList<QType *>>("QList<QtUml::QType *>"); - qRegisterMetaType<QSet<QType *>>("QSet<QtUml::QType *>"); - qRegisterMetaType<QTypedElement *>("QtUml::QTypedElement *"); - qRegisterMetaType<QList<QTypedElement *>>("QList<QtUml::QTypedElement *>"); - qRegisterMetaType<QSet<QTypedElement *>>("QSet<QtUml::QTypedElement *>"); - qRegisterMetaType<QUnmarshallAction *>("QtUml::QUnmarshallAction *"); - qRegisterMetaType<QList<QUnmarshallAction *>>("QList<QtUml::QUnmarshallAction *>"); - qRegisterMetaType<QSet<QUnmarshallAction *>>("QSet<QtUml::QUnmarshallAction *>"); - qRegisterMetaType<QUsage *>("QtUml::QUsage *"); - qRegisterMetaType<QList<QUsage *>>("QList<QtUml::QUsage *>"); - qRegisterMetaType<QSet<QUsage *>>("QSet<QtUml::QUsage *>"); - qRegisterMetaType<QUseCase *>("QtUml::QUseCase *"); - qRegisterMetaType<QList<QUseCase *>>("QList<QtUml::QUseCase *>"); - qRegisterMetaType<QSet<QUseCase *>>("QSet<QtUml::QUseCase *>"); - qRegisterMetaType<QValuePin *>("QtUml::QValuePin *"); - qRegisterMetaType<QList<QValuePin *>>("QList<QtUml::QValuePin *>"); - qRegisterMetaType<QSet<QValuePin *>>("QSet<QtUml::QValuePin *>"); - qRegisterMetaType<QValueSpecification *>("QtUml::QValueSpecification *"); - qRegisterMetaType<QList<QValueSpecification *>>("QList<QtUml::QValueSpecification *>"); - qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QtUml::QValueSpecification *>"); - qRegisterMetaType<QValueSpecificationAction *>("QtUml::QValueSpecificationAction *"); - qRegisterMetaType<QList<QValueSpecificationAction *>>("QList<QtUml::QValueSpecificationAction *>"); - qRegisterMetaType<QSet<QValueSpecificationAction *>>("QSet<QtUml::QValueSpecificationAction *>"); - qRegisterMetaType<QVariable *>("QtUml::QVariable *"); - qRegisterMetaType<QList<QVariable *>>("QList<QtUml::QVariable *>"); - qRegisterMetaType<QSet<QVariable *>>("QSet<QtUml::QVariable *>"); - qRegisterMetaType<QVariableAction *>("QtUml::QVariableAction *"); - qRegisterMetaType<QList<QVariableAction *>>("QList<QtUml::QVariableAction *>"); - qRegisterMetaType<QSet<QVariableAction *>>("QSet<QtUml::QVariableAction *>"); - qRegisterMetaType<QVertex *>("QtUml::QVertex *"); - qRegisterMetaType<QList<QVertex *>>("QList<QtUml::QVertex *>"); - qRegisterMetaType<QSet<QVertex *>>("QSet<QtUml::QVertex *>"); - qRegisterMetaType<QWriteLinkAction *>("QtUml::QWriteLinkAction *"); - qRegisterMetaType<QList<QWriteLinkAction *>>("QList<QtUml::QWriteLinkAction *>"); - qRegisterMetaType<QSet<QWriteLinkAction *>>("QSet<QtUml::QWriteLinkAction *>"); - qRegisterMetaType<QWriteStructuralFeatureAction *>("QtUml::QWriteStructuralFeatureAction *"); - qRegisterMetaType<QList<QWriteStructuralFeatureAction *>>("QList<QtUml::QWriteStructuralFeatureAction *>"); - qRegisterMetaType<QSet<QWriteStructuralFeatureAction *>>("QSet<QtUml::QWriteStructuralFeatureAction *>"); - qRegisterMetaType<QWriteVariableAction *>("QtUml::QWriteVariableAction *"); - qRegisterMetaType<QList<QWriteVariableAction *>>("QList<QtUml::QWriteVariableAction *>"); - qRegisterMetaType<QSet<QWriteVariableAction *>>("QSet<QtUml::QWriteVariableAction *>"); + qRegisterMetaType<QAbstraction *>(); + qRegisterMetaType<QList<QAbstraction *>>(); + qRegisterMetaType<QSet<QAbstraction *>>(); + qRegisterMetaType<QAcceptCallAction *>(); + qRegisterMetaType<QList<QAcceptCallAction *>>(); + qRegisterMetaType<QSet<QAcceptCallAction *>>(); + qRegisterMetaType<QAcceptEventAction *>(); + qRegisterMetaType<QList<QAcceptEventAction *>>(); + qRegisterMetaType<QSet<QAcceptEventAction *>>(); + qRegisterMetaType<QAction *>(); + qRegisterMetaType<QList<QAction *>>(); + qRegisterMetaType<QSet<QAction *>>(); + qRegisterMetaType<QActionExecutionSpecification *>(); + qRegisterMetaType<QList<QActionExecutionSpecification *>>(); + qRegisterMetaType<QSet<QActionExecutionSpecification *>>(); + qRegisterMetaType<QActionInputPin *>(); + qRegisterMetaType<QList<QActionInputPin *>>(); + qRegisterMetaType<QSet<QActionInputPin *>>(); + qRegisterMetaType<QActivity *>(); + qRegisterMetaType<QList<QActivity *>>(); + qRegisterMetaType<QSet<QActivity *>>(); + qRegisterMetaType<QActivityEdge *>(); + qRegisterMetaType<QList<QActivityEdge *>>(); + qRegisterMetaType<QSet<QActivityEdge *>>(); + qRegisterMetaType<QActivityFinalNode *>(); + qRegisterMetaType<QList<QActivityFinalNode *>>(); + qRegisterMetaType<QSet<QActivityFinalNode *>>(); + qRegisterMetaType<QActivityGroup *>(); + qRegisterMetaType<QList<QActivityGroup *>>(); + qRegisterMetaType<QSet<QActivityGroup *>>(); + qRegisterMetaType<QActivityNode *>(); + qRegisterMetaType<QList<QActivityNode *>>(); + qRegisterMetaType<QSet<QActivityNode *>>(); + qRegisterMetaType<QActivityParameterNode *>(); + qRegisterMetaType<QList<QActivityParameterNode *>>(); + qRegisterMetaType<QSet<QActivityParameterNode *>>(); + qRegisterMetaType<QActivityPartition *>(); + qRegisterMetaType<QList<QActivityPartition *>>(); + qRegisterMetaType<QSet<QActivityPartition *>>(); + qRegisterMetaType<QActor *>(); + qRegisterMetaType<QList<QActor *>>(); + qRegisterMetaType<QSet<QActor *>>(); + qRegisterMetaType<QAddStructuralFeatureValueAction *>(); + qRegisterMetaType<QList<QAddStructuralFeatureValueAction *>>(); + qRegisterMetaType<QSet<QAddStructuralFeatureValueAction *>>(); + qRegisterMetaType<QAddVariableValueAction *>(); + qRegisterMetaType<QList<QAddVariableValueAction *>>(); + qRegisterMetaType<QSet<QAddVariableValueAction *>>(); + qRegisterMetaType<QAnyReceiveEvent *>(); + qRegisterMetaType<QList<QAnyReceiveEvent *>>(); + qRegisterMetaType<QSet<QAnyReceiveEvent *>>(); + qRegisterMetaType<QArtifact *>(); + qRegisterMetaType<QList<QArtifact *>>(); + qRegisterMetaType<QSet<QArtifact *>>(); + qRegisterMetaType<QAssociation *>(); + qRegisterMetaType<QList<QAssociation *>>(); + qRegisterMetaType<QSet<QAssociation *>>(); + qRegisterMetaType<QAssociationClass *>(); + qRegisterMetaType<QList<QAssociationClass *>>(); + qRegisterMetaType<QSet<QAssociationClass *>>(); + qRegisterMetaType<QBehavior *>(); + qRegisterMetaType<QList<QBehavior *>>(); + qRegisterMetaType<QSet<QBehavior *>>(); + qRegisterMetaType<QBehavioralFeature *>(); + qRegisterMetaType<QList<QBehavioralFeature *>>(); + qRegisterMetaType<QSet<QBehavioralFeature *>>(); + qRegisterMetaType<QBehavioredClassifier *>(); + qRegisterMetaType<QList<QBehavioredClassifier *>>(); + qRegisterMetaType<QSet<QBehavioredClassifier *>>(); + qRegisterMetaType<QBehaviorExecutionSpecification *>(); + qRegisterMetaType<QList<QBehaviorExecutionSpecification *>>(); + qRegisterMetaType<QSet<QBehaviorExecutionSpecification *>>(); + qRegisterMetaType<QBroadcastSignalAction *>(); + qRegisterMetaType<QList<QBroadcastSignalAction *>>(); + qRegisterMetaType<QSet<QBroadcastSignalAction *>>(); + qRegisterMetaType<QCallAction *>(); + qRegisterMetaType<QList<QCallAction *>>(); + qRegisterMetaType<QSet<QCallAction *>>(); + qRegisterMetaType<QCallBehaviorAction *>(); + qRegisterMetaType<QList<QCallBehaviorAction *>>(); + qRegisterMetaType<QSet<QCallBehaviorAction *>>(); + qRegisterMetaType<QCallEvent *>(); + qRegisterMetaType<QList<QCallEvent *>>(); + qRegisterMetaType<QSet<QCallEvent *>>(); + qRegisterMetaType<QCallOperationAction *>(); + qRegisterMetaType<QList<QCallOperationAction *>>(); + qRegisterMetaType<QSet<QCallOperationAction *>>(); + qRegisterMetaType<QCentralBufferNode *>(); + qRegisterMetaType<QList<QCentralBufferNode *>>(); + qRegisterMetaType<QSet<QCentralBufferNode *>>(); + qRegisterMetaType<QChangeEvent *>(); + qRegisterMetaType<QList<QChangeEvent *>>(); + qRegisterMetaType<QSet<QChangeEvent *>>(); + qRegisterMetaType<QClass *>(); + qRegisterMetaType<QList<QClass *>>(); + qRegisterMetaType<QSet<QClass *>>(); + qRegisterMetaType<QClassifier *>(); + qRegisterMetaType<QList<QClassifier *>>(); + qRegisterMetaType<QSet<QClassifier *>>(); + qRegisterMetaType<QClassifierTemplateParameter *>(); + qRegisterMetaType<QList<QClassifierTemplateParameter *>>(); + qRegisterMetaType<QSet<QClassifierTemplateParameter *>>(); + qRegisterMetaType<QClause *>(); + qRegisterMetaType<QList<QClause *>>(); + qRegisterMetaType<QSet<QClause *>>(); + qRegisterMetaType<QClearAssociationAction *>(); + qRegisterMetaType<QList<QClearAssociationAction *>>(); + qRegisterMetaType<QSet<QClearAssociationAction *>>(); + qRegisterMetaType<QClearStructuralFeatureAction *>(); + qRegisterMetaType<QList<QClearStructuralFeatureAction *>>(); + qRegisterMetaType<QSet<QClearStructuralFeatureAction *>>(); + qRegisterMetaType<QClearVariableAction *>(); + qRegisterMetaType<QList<QClearVariableAction *>>(); + qRegisterMetaType<QSet<QClearVariableAction *>>(); + qRegisterMetaType<QCollaboration *>(); + qRegisterMetaType<QList<QCollaboration *>>(); + qRegisterMetaType<QSet<QCollaboration *>>(); + qRegisterMetaType<QCollaborationUse *>(); + qRegisterMetaType<QList<QCollaborationUse *>>(); + qRegisterMetaType<QSet<QCollaborationUse *>>(); + qRegisterMetaType<QCombinedFragment *>(); + qRegisterMetaType<QList<QCombinedFragment *>>(); + qRegisterMetaType<QSet<QCombinedFragment *>>(); + qRegisterMetaType<QComment *>(); + qRegisterMetaType<QList<QComment *>>(); + qRegisterMetaType<QSet<QComment *>>(); + qRegisterMetaType<QCommunicationPath *>(); + qRegisterMetaType<QList<QCommunicationPath *>>(); + qRegisterMetaType<QSet<QCommunicationPath *>>(); + qRegisterMetaType<QComponent *>(); + qRegisterMetaType<QList<QComponent *>>(); + qRegisterMetaType<QSet<QComponent *>>(); + qRegisterMetaType<QComponentRealization *>(); + qRegisterMetaType<QList<QComponentRealization *>>(); + qRegisterMetaType<QSet<QComponentRealization *>>(); + qRegisterMetaType<QConditionalNode *>(); + qRegisterMetaType<QList<QConditionalNode *>>(); + qRegisterMetaType<QSet<QConditionalNode *>>(); + qRegisterMetaType<QConnectableElement *>(); + qRegisterMetaType<QList<QConnectableElement *>>(); + qRegisterMetaType<QSet<QConnectableElement *>>(); + qRegisterMetaType<QConnectableElementTemplateParameter *>(); + qRegisterMetaType<QList<QConnectableElementTemplateParameter *>>(); + qRegisterMetaType<QSet<QConnectableElementTemplateParameter *>>(); + qRegisterMetaType<QConnectionPointReference *>(); + qRegisterMetaType<QList<QConnectionPointReference *>>(); + qRegisterMetaType<QSet<QConnectionPointReference *>>(); + qRegisterMetaType<QConnector *>(); + qRegisterMetaType<QList<QConnector *>>(); + qRegisterMetaType<QSet<QConnector *>>(); + qRegisterMetaType<QConnectorEnd *>(); + qRegisterMetaType<QList<QConnectorEnd *>>(); + qRegisterMetaType<QSet<QConnectorEnd *>>(); + qRegisterMetaType<QConsiderIgnoreFragment *>(); + qRegisterMetaType<QList<QConsiderIgnoreFragment *>>(); + qRegisterMetaType<QSet<QConsiderIgnoreFragment *>>(); + qRegisterMetaType<QConstraint *>(); + qRegisterMetaType<QList<QConstraint *>>(); + qRegisterMetaType<QSet<QConstraint *>>(); + qRegisterMetaType<QContinuation *>(); + qRegisterMetaType<QList<QContinuation *>>(); + qRegisterMetaType<QSet<QContinuation *>>(); + qRegisterMetaType<QControlFlow *>(); + qRegisterMetaType<QList<QControlFlow *>>(); + qRegisterMetaType<QSet<QControlFlow *>>(); + qRegisterMetaType<QControlNode *>(); + qRegisterMetaType<QList<QControlNode *>>(); + qRegisterMetaType<QSet<QControlNode *>>(); + qRegisterMetaType<QCreateLinkAction *>(); + qRegisterMetaType<QList<QCreateLinkAction *>>(); + qRegisterMetaType<QSet<QCreateLinkAction *>>(); + qRegisterMetaType<QCreateLinkObjectAction *>(); + qRegisterMetaType<QList<QCreateLinkObjectAction *>>(); + qRegisterMetaType<QSet<QCreateLinkObjectAction *>>(); + qRegisterMetaType<QCreateObjectAction *>(); + qRegisterMetaType<QList<QCreateObjectAction *>>(); + qRegisterMetaType<QSet<QCreateObjectAction *>>(); + qRegisterMetaType<QDataStoreNode *>(); + qRegisterMetaType<QList<QDataStoreNode *>>(); + qRegisterMetaType<QSet<QDataStoreNode *>>(); + qRegisterMetaType<QDataType *>(); + qRegisterMetaType<QList<QDataType *>>(); + qRegisterMetaType<QSet<QDataType *>>(); + qRegisterMetaType<QDecisionNode *>(); + qRegisterMetaType<QList<QDecisionNode *>>(); + qRegisterMetaType<QSet<QDecisionNode *>>(); + qRegisterMetaType<QDependency *>(); + qRegisterMetaType<QList<QDependency *>>(); + qRegisterMetaType<QSet<QDependency *>>(); + qRegisterMetaType<QDeployedArtifact *>(); + qRegisterMetaType<QList<QDeployedArtifact *>>(); + qRegisterMetaType<QSet<QDeployedArtifact *>>(); + qRegisterMetaType<QDeployment *>(); + qRegisterMetaType<QList<QDeployment *>>(); + qRegisterMetaType<QSet<QDeployment *>>(); + qRegisterMetaType<QDeploymentSpecification *>(); + qRegisterMetaType<QList<QDeploymentSpecification *>>(); + qRegisterMetaType<QSet<QDeploymentSpecification *>>(); + qRegisterMetaType<QDeploymentTarget *>(); + qRegisterMetaType<QList<QDeploymentTarget *>>(); + qRegisterMetaType<QSet<QDeploymentTarget *>>(); + qRegisterMetaType<QDestroyLinkAction *>(); + qRegisterMetaType<QList<QDestroyLinkAction *>>(); + qRegisterMetaType<QSet<QDestroyLinkAction *>>(); + qRegisterMetaType<QDestroyObjectAction *>(); + qRegisterMetaType<QList<QDestroyObjectAction *>>(); + qRegisterMetaType<QSet<QDestroyObjectAction *>>(); + qRegisterMetaType<QDestructionOccurrenceSpecification *>(); + qRegisterMetaType<QList<QDestructionOccurrenceSpecification *>>(); + qRegisterMetaType<QSet<QDestructionOccurrenceSpecification *>>(); + qRegisterMetaType<QDevice *>(); + qRegisterMetaType<QList<QDevice *>>(); + qRegisterMetaType<QSet<QDevice *>>(); + qRegisterMetaType<QDirectedRelationship *>(); + qRegisterMetaType<QList<QDirectedRelationship *>>(); + qRegisterMetaType<QSet<QDirectedRelationship *>>(); + qRegisterMetaType<QDuration *>(); + qRegisterMetaType<QList<QDuration *>>(); + qRegisterMetaType<QSet<QDuration *>>(); + qRegisterMetaType<QDurationConstraint *>(); + qRegisterMetaType<QList<QDurationConstraint *>>(); + qRegisterMetaType<QSet<QDurationConstraint *>>(); + qRegisterMetaType<QDurationInterval *>(); + qRegisterMetaType<QList<QDurationInterval *>>(); + qRegisterMetaType<QSet<QDurationInterval *>>(); + qRegisterMetaType<QDurationObservation *>(); + qRegisterMetaType<QList<QDurationObservation *>>(); + qRegisterMetaType<QSet<QDurationObservation *>>(); + qRegisterMetaType<QElement *>(); + qRegisterMetaType<QList<QElement *>>(); + qRegisterMetaType<QSet<QElement *>>(); + qRegisterMetaType<QElementImport *>(); + qRegisterMetaType<QList<QElementImport *>>(); + qRegisterMetaType<QSet<QElementImport *>>(); + qRegisterMetaType<QEncapsulatedClassifier *>(); + qRegisterMetaType<QList<QEncapsulatedClassifier *>>(); + qRegisterMetaType<QSet<QEncapsulatedClassifier *>>(); + qRegisterMetaType<QEnumeration *>(); + qRegisterMetaType<QList<QEnumeration *>>(); + qRegisterMetaType<QSet<QEnumeration *>>(); + qRegisterMetaType<QEnumerationLiteral *>(); + qRegisterMetaType<QList<QEnumerationLiteral *>>(); + qRegisterMetaType<QSet<QEnumerationLiteral *>>(); + qRegisterMetaType<QEvent *>(); + qRegisterMetaType<QList<QEvent *>>(); + qRegisterMetaType<QSet<QEvent *>>(); + qRegisterMetaType<QExceptionHandler *>(); + qRegisterMetaType<QList<QExceptionHandler *>>(); + qRegisterMetaType<QSet<QExceptionHandler *>>(); + qRegisterMetaType<QExecutableNode *>(); + qRegisterMetaType<QList<QExecutableNode *>>(); + qRegisterMetaType<QSet<QExecutableNode *>>(); + qRegisterMetaType<QExecutionEnvironment *>(); + qRegisterMetaType<QList<QExecutionEnvironment *>>(); + qRegisterMetaType<QSet<QExecutionEnvironment *>>(); + qRegisterMetaType<QExecutionOccurrenceSpecification *>(); + qRegisterMetaType<QList<QExecutionOccurrenceSpecification *>>(); + qRegisterMetaType<QSet<QExecutionOccurrenceSpecification *>>(); + qRegisterMetaType<QExecutionSpecification *>(); + qRegisterMetaType<QList<QExecutionSpecification *>>(); + qRegisterMetaType<QSet<QExecutionSpecification *>>(); + qRegisterMetaType<QExpansionNode *>(); + qRegisterMetaType<QList<QExpansionNode *>>(); + qRegisterMetaType<QSet<QExpansionNode *>>(); + qRegisterMetaType<QExpansionRegion *>(); + qRegisterMetaType<QList<QExpansionRegion *>>(); + qRegisterMetaType<QSet<QExpansionRegion *>>(); + qRegisterMetaType<QExpression *>(); + qRegisterMetaType<QList<QExpression *>>(); + qRegisterMetaType<QSet<QExpression *>>(); + qRegisterMetaType<QExtend *>(); + qRegisterMetaType<QList<QExtend *>>(); + qRegisterMetaType<QSet<QExtend *>>(); + qRegisterMetaType<QExtension *>(); + qRegisterMetaType<QList<QExtension *>>(); + qRegisterMetaType<QSet<QExtension *>>(); + qRegisterMetaType<QExtensionEnd *>(); + qRegisterMetaType<QList<QExtensionEnd *>>(); + qRegisterMetaType<QSet<QExtensionEnd *>>(); + qRegisterMetaType<QExtensionPoint *>(); + qRegisterMetaType<QList<QExtensionPoint *>>(); + qRegisterMetaType<QSet<QExtensionPoint *>>(); + qRegisterMetaType<QFeature *>(); + qRegisterMetaType<QList<QFeature *>>(); + qRegisterMetaType<QSet<QFeature *>>(); + qRegisterMetaType<QFinalNode *>(); + qRegisterMetaType<QList<QFinalNode *>>(); + qRegisterMetaType<QSet<QFinalNode *>>(); + qRegisterMetaType<QFinalState *>(); + qRegisterMetaType<QList<QFinalState *>>(); + qRegisterMetaType<QSet<QFinalState *>>(); + qRegisterMetaType<QFlowFinalNode *>(); + qRegisterMetaType<QList<QFlowFinalNode *>>(); + qRegisterMetaType<QSet<QFlowFinalNode *>>(); + qRegisterMetaType<QForkNode *>(); + qRegisterMetaType<QList<QForkNode *>>(); + qRegisterMetaType<QSet<QForkNode *>>(); + qRegisterMetaType<QFunctionBehavior *>(); + qRegisterMetaType<QList<QFunctionBehavior *>>(); + qRegisterMetaType<QSet<QFunctionBehavior *>>(); + qRegisterMetaType<QGate *>(); + qRegisterMetaType<QList<QGate *>>(); + qRegisterMetaType<QSet<QGate *>>(); + qRegisterMetaType<QGeneralization *>(); + qRegisterMetaType<QList<QGeneralization *>>(); + qRegisterMetaType<QSet<QGeneralization *>>(); + qRegisterMetaType<QGeneralizationSet *>(); + qRegisterMetaType<QList<QGeneralizationSet *>>(); + qRegisterMetaType<QSet<QGeneralizationSet *>>(); + qRegisterMetaType<QGeneralOrdering *>(); + qRegisterMetaType<QList<QGeneralOrdering *>>(); + qRegisterMetaType<QSet<QGeneralOrdering *>>(); + qRegisterMetaType<QImage *>(); + qRegisterMetaType<QList<QImage *>>(); + qRegisterMetaType<QSet<QImage *>>(); + qRegisterMetaType<QInclude *>(); + qRegisterMetaType<QList<QInclude *>>(); + qRegisterMetaType<QSet<QInclude *>>(); + qRegisterMetaType<QInformationFlow *>(); + qRegisterMetaType<QList<QInformationFlow *>>(); + qRegisterMetaType<QSet<QInformationFlow *>>(); + qRegisterMetaType<QInformationItem *>(); + qRegisterMetaType<QList<QInformationItem *>>(); + qRegisterMetaType<QSet<QInformationItem *>>(); + qRegisterMetaType<QInitialNode *>(); + qRegisterMetaType<QList<QInitialNode *>>(); + qRegisterMetaType<QSet<QInitialNode *>>(); + qRegisterMetaType<QInputPin *>(); + qRegisterMetaType<QList<QInputPin *>>(); + qRegisterMetaType<QSet<QInputPin *>>(); + qRegisterMetaType<QInstanceSpecification *>(); + qRegisterMetaType<QList<QInstanceSpecification *>>(); + qRegisterMetaType<QSet<QInstanceSpecification *>>(); + qRegisterMetaType<QInstanceValue *>(); + qRegisterMetaType<QList<QInstanceValue *>>(); + qRegisterMetaType<QSet<QInstanceValue *>>(); + qRegisterMetaType<QInteraction *>(); + qRegisterMetaType<QList<QInteraction *>>(); + qRegisterMetaType<QSet<QInteraction *>>(); + qRegisterMetaType<QInteractionConstraint *>(); + qRegisterMetaType<QList<QInteractionConstraint *>>(); + qRegisterMetaType<QSet<QInteractionConstraint *>>(); + qRegisterMetaType<QInteractionFragment *>(); + qRegisterMetaType<QList<QInteractionFragment *>>(); + qRegisterMetaType<QSet<QInteractionFragment *>>(); + qRegisterMetaType<QInteractionOperand *>(); + qRegisterMetaType<QList<QInteractionOperand *>>(); + qRegisterMetaType<QSet<QInteractionOperand *>>(); + qRegisterMetaType<QInteractionUse *>(); + qRegisterMetaType<QList<QInteractionUse *>>(); + qRegisterMetaType<QSet<QInteractionUse *>>(); + qRegisterMetaType<QInterface *>(); + qRegisterMetaType<QList<QInterface *>>(); + qRegisterMetaType<QSet<QInterface *>>(); + qRegisterMetaType<QInterfaceRealization *>(); + qRegisterMetaType<QList<QInterfaceRealization *>>(); + qRegisterMetaType<QSet<QInterfaceRealization *>>(); + qRegisterMetaType<QInterruptibleActivityRegion *>(); + qRegisterMetaType<QList<QInterruptibleActivityRegion *>>(); + qRegisterMetaType<QSet<QInterruptibleActivityRegion *>>(); + qRegisterMetaType<QInterval *>(); + qRegisterMetaType<QList<QInterval *>>(); + qRegisterMetaType<QSet<QInterval *>>(); + qRegisterMetaType<QIntervalConstraint *>(); + qRegisterMetaType<QList<QIntervalConstraint *>>(); + qRegisterMetaType<QSet<QIntervalConstraint *>>(); + qRegisterMetaType<QInvocationAction *>(); + qRegisterMetaType<QList<QInvocationAction *>>(); + qRegisterMetaType<QSet<QInvocationAction *>>(); + qRegisterMetaType<QJoinNode *>(); + qRegisterMetaType<QList<QJoinNode *>>(); + qRegisterMetaType<QSet<QJoinNode *>>(); + qRegisterMetaType<QLifeline *>(); + qRegisterMetaType<QList<QLifeline *>>(); + qRegisterMetaType<QSet<QLifeline *>>(); + qRegisterMetaType<QLinkAction *>(); + qRegisterMetaType<QList<QLinkAction *>>(); + qRegisterMetaType<QSet<QLinkAction *>>(); + qRegisterMetaType<QLinkEndCreationData *>(); + qRegisterMetaType<QList<QLinkEndCreationData *>>(); + qRegisterMetaType<QSet<QLinkEndCreationData *>>(); + qRegisterMetaType<QLinkEndData *>(); + qRegisterMetaType<QList<QLinkEndData *>>(); + qRegisterMetaType<QSet<QLinkEndData *>>(); + qRegisterMetaType<QLinkEndDestructionData *>(); + qRegisterMetaType<QList<QLinkEndDestructionData *>>(); + qRegisterMetaType<QSet<QLinkEndDestructionData *>>(); + qRegisterMetaType<QLiteralBoolean *>(); + qRegisterMetaType<QList<QLiteralBoolean *>>(); + qRegisterMetaType<QSet<QLiteralBoolean *>>(); + qRegisterMetaType<QLiteralInteger *>(); + qRegisterMetaType<QList<QLiteralInteger *>>(); + qRegisterMetaType<QSet<QLiteralInteger *>>(); + qRegisterMetaType<QLiteralNull *>(); + qRegisterMetaType<QList<QLiteralNull *>>(); + qRegisterMetaType<QSet<QLiteralNull *>>(); + qRegisterMetaType<QLiteralReal *>(); + qRegisterMetaType<QList<QLiteralReal *>>(); + qRegisterMetaType<QSet<QLiteralReal *>>(); + qRegisterMetaType<QLiteralSpecification *>(); + qRegisterMetaType<QList<QLiteralSpecification *>>(); + qRegisterMetaType<QSet<QLiteralSpecification *>>(); + qRegisterMetaType<QLiteralString *>(); + qRegisterMetaType<QList<QLiteralString *>>(); + qRegisterMetaType<QSet<QLiteralString *>>(); + qRegisterMetaType<QLiteralUnlimitedNatural *>(); + qRegisterMetaType<QList<QLiteralUnlimitedNatural *>>(); + qRegisterMetaType<QSet<QLiteralUnlimitedNatural *>>(); + qRegisterMetaType<QLoopNode *>(); + qRegisterMetaType<QList<QLoopNode *>>(); + qRegisterMetaType<QSet<QLoopNode *>>(); + qRegisterMetaType<QManifestation *>(); + qRegisterMetaType<QList<QManifestation *>>(); + qRegisterMetaType<QSet<QManifestation *>>(); + qRegisterMetaType<QMergeNode *>(); + qRegisterMetaType<QList<QMergeNode *>>(); + qRegisterMetaType<QSet<QMergeNode *>>(); + qRegisterMetaType<QMessage *>(); + qRegisterMetaType<QList<QMessage *>>(); + qRegisterMetaType<QSet<QMessage *>>(); + qRegisterMetaType<QMessageEnd *>(); + qRegisterMetaType<QList<QMessageEnd *>>(); + qRegisterMetaType<QSet<QMessageEnd *>>(); + qRegisterMetaType<QMessageEvent *>(); + qRegisterMetaType<QList<QMessageEvent *>>(); + qRegisterMetaType<QSet<QMessageEvent *>>(); + qRegisterMetaType<QMessageOccurrenceSpecification *>(); + qRegisterMetaType<QList<QMessageOccurrenceSpecification *>>(); + qRegisterMetaType<QSet<QMessageOccurrenceSpecification *>>(); + qRegisterMetaType<QModel *>(); + qRegisterMetaType<QList<QModel *>>(); + qRegisterMetaType<QSet<QModel *>>(); + qRegisterMetaType<QMultiplicityElement *>(); + qRegisterMetaType<QList<QMultiplicityElement *>>(); + qRegisterMetaType<QSet<QMultiplicityElement *>>(); + qRegisterMetaType<QNamedElement *>(); + qRegisterMetaType<QList<QNamedElement *>>(); + qRegisterMetaType<QSet<QNamedElement *>>(); + qRegisterMetaType<QNamespace *>(); + qRegisterMetaType<QList<QNamespace *>>(); + qRegisterMetaType<QSet<QNamespace *>>(); + + qRegisterMetaType<QNamespace *>("::QtUml::QNamespace*"); + + qRegisterMetaType<QNode *>(); + qRegisterMetaType<QList<QNode *>>(); + qRegisterMetaType<QSet<QNode *>>(); + qRegisterMetaType<QObjectFlow *>(); + qRegisterMetaType<QList<QObjectFlow *>>(); + qRegisterMetaType<QSet<QObjectFlow *>>(); + qRegisterMetaType<QObjectNode *>(); + qRegisterMetaType<QList<QObjectNode *>>(); + qRegisterMetaType<QSet<QObjectNode *>>(); + qRegisterMetaType<QObservation *>(); + qRegisterMetaType<QList<QObservation *>>(); + qRegisterMetaType<QSet<QObservation *>>(); + qRegisterMetaType<QOccurrenceSpecification *>(); + qRegisterMetaType<QList<QOccurrenceSpecification *>>(); + qRegisterMetaType<QSet<QOccurrenceSpecification *>>(); + qRegisterMetaType<QOpaqueAction *>(); + qRegisterMetaType<QList<QOpaqueAction *>>(); + qRegisterMetaType<QSet<QOpaqueAction *>>(); + qRegisterMetaType<QOpaqueBehavior *>(); + qRegisterMetaType<QList<QOpaqueBehavior *>>(); + qRegisterMetaType<QSet<QOpaqueBehavior *>>(); + qRegisterMetaType<QOpaqueExpression *>(); + qRegisterMetaType<QList<QOpaqueExpression *>>(); + qRegisterMetaType<QSet<QOpaqueExpression *>>(); + qRegisterMetaType<QOperation *>(); + qRegisterMetaType<QList<QOperation *>>(); + qRegisterMetaType<QSet<QOperation *>>(); + qRegisterMetaType<QOperationTemplateParameter *>(); + qRegisterMetaType<QList<QOperationTemplateParameter *>>(); + qRegisterMetaType<QSet<QOperationTemplateParameter *>>(); + qRegisterMetaType<QOutputPin *>(); + qRegisterMetaType<QList<QOutputPin *>>(); + qRegisterMetaType<QSet<QOutputPin *>>(); + qRegisterMetaType<QPackage *>(); + qRegisterMetaType<QList<QPackage *>>(); + qRegisterMetaType<QSet<QPackage *>>(); + qRegisterMetaType<QPackageableElement *>(); + qRegisterMetaType<QList<QPackageableElement *>>(); + qRegisterMetaType<QSet<QPackageableElement *>>(); + qRegisterMetaType<QPackageImport *>(); + qRegisterMetaType<QList<QPackageImport *>>(); + qRegisterMetaType<QSet<QPackageImport *>>(); + qRegisterMetaType<QPackageMerge *>(); + qRegisterMetaType<QList<QPackageMerge *>>(); + qRegisterMetaType<QSet<QPackageMerge *>>(); + qRegisterMetaType<QParameter *>(); + qRegisterMetaType<QList<QParameter *>>(); + qRegisterMetaType<QSet<QParameter *>>(); + qRegisterMetaType<QParameterableElement *>(); + qRegisterMetaType<QList<QParameterableElement *>>(); + qRegisterMetaType<QSet<QParameterableElement *>>(); + qRegisterMetaType<QParameterSet *>(); + qRegisterMetaType<QList<QParameterSet *>>(); + qRegisterMetaType<QSet<QParameterSet *>>(); + qRegisterMetaType<QPartDecomposition *>(); + qRegisterMetaType<QList<QPartDecomposition *>>(); + qRegisterMetaType<QSet<QPartDecomposition *>>(); + qRegisterMetaType<QPin *>(); + qRegisterMetaType<QList<QPin *>>(); + qRegisterMetaType<QSet<QPin *>>(); + qRegisterMetaType<QPort *>(); + qRegisterMetaType<QList<QPort *>>(); + qRegisterMetaType<QSet<QPort *>>(); + qRegisterMetaType<QPrimitiveType *>(); + qRegisterMetaType<QList<QPrimitiveType *>>(); + qRegisterMetaType<QSet<QPrimitiveType *>>(); + qRegisterMetaType<QProfile *>(); + qRegisterMetaType<QList<QProfile *>>(); + qRegisterMetaType<QSet<QProfile *>>(); + qRegisterMetaType<QProfileApplication *>(); + qRegisterMetaType<QList<QProfileApplication *>>(); + qRegisterMetaType<QSet<QProfileApplication *>>(); + qRegisterMetaType<QProperty *>(); + qRegisterMetaType<QList<QProperty *>>(); + qRegisterMetaType<QSet<QProperty *>>(); + qRegisterMetaType<QProtocolConformance *>(); + qRegisterMetaType<QList<QProtocolConformance *>>(); + qRegisterMetaType<QSet<QProtocolConformance *>>(); + qRegisterMetaType<QProtocolStateMachine *>(); + qRegisterMetaType<QList<QProtocolStateMachine *>>(); + qRegisterMetaType<QSet<QProtocolStateMachine *>>(); + qRegisterMetaType<QProtocolTransition *>(); + qRegisterMetaType<QList<QProtocolTransition *>>(); + qRegisterMetaType<QSet<QProtocolTransition *>>(); + qRegisterMetaType<QPseudostate *>(); + qRegisterMetaType<QList<QPseudostate *>>(); + qRegisterMetaType<QSet<QPseudostate *>>(); + qRegisterMetaType<QQualifierValue *>(); + qRegisterMetaType<QList<QQualifierValue *>>(); + qRegisterMetaType<QSet<QQualifierValue *>>(); + qRegisterMetaType<QRaiseExceptionAction *>(); + qRegisterMetaType<QList<QRaiseExceptionAction *>>(); + qRegisterMetaType<QSet<QRaiseExceptionAction *>>(); + qRegisterMetaType<QReadExtentAction *>(); + qRegisterMetaType<QList<QReadExtentAction *>>(); + qRegisterMetaType<QSet<QReadExtentAction *>>(); + qRegisterMetaType<QReadIsClassifiedObjectAction *>(); + qRegisterMetaType<QList<QReadIsClassifiedObjectAction *>>(); + qRegisterMetaType<QSet<QReadIsClassifiedObjectAction *>>(); + qRegisterMetaType<QReadLinkAction *>(); + qRegisterMetaType<QList<QReadLinkAction *>>(); + qRegisterMetaType<QSet<QReadLinkAction *>>(); + qRegisterMetaType<QReadLinkObjectEndAction *>(); + qRegisterMetaType<QList<QReadLinkObjectEndAction *>>(); + qRegisterMetaType<QSet<QReadLinkObjectEndAction *>>(); + qRegisterMetaType<QReadLinkObjectEndQualifierAction *>(); + qRegisterMetaType<QList<QReadLinkObjectEndQualifierAction *>>(); + qRegisterMetaType<QSet<QReadLinkObjectEndQualifierAction *>>(); + qRegisterMetaType<QReadSelfAction *>(); + qRegisterMetaType<QList<QReadSelfAction *>>(); + qRegisterMetaType<QSet<QReadSelfAction *>>(); + qRegisterMetaType<QReadStructuralFeatureAction *>(); + qRegisterMetaType<QList<QReadStructuralFeatureAction *>>(); + qRegisterMetaType<QSet<QReadStructuralFeatureAction *>>(); + qRegisterMetaType<QReadVariableAction *>(); + qRegisterMetaType<QList<QReadVariableAction *>>(); + qRegisterMetaType<QSet<QReadVariableAction *>>(); + qRegisterMetaType<QRealization *>(); + qRegisterMetaType<QList<QRealization *>>(); + qRegisterMetaType<QSet<QRealization *>>(); + qRegisterMetaType<QReception *>(); + qRegisterMetaType<QList<QReception *>>(); + qRegisterMetaType<QSet<QReception *>>(); + qRegisterMetaType<QReclassifyObjectAction *>(); + qRegisterMetaType<QList<QReclassifyObjectAction *>>(); + qRegisterMetaType<QSet<QReclassifyObjectAction *>>(); + qRegisterMetaType<QRedefinableElement *>(); + qRegisterMetaType<QList<QRedefinableElement *>>(); + qRegisterMetaType<QSet<QRedefinableElement *>>(); + qRegisterMetaType<QRedefinableTemplateSignature *>(); + qRegisterMetaType<QList<QRedefinableTemplateSignature *>>(); + qRegisterMetaType<QSet<QRedefinableTemplateSignature *>>(); + qRegisterMetaType<QReduceAction *>(); + qRegisterMetaType<QList<QReduceAction *>>(); + qRegisterMetaType<QSet<QReduceAction *>>(); + qRegisterMetaType<QRegion *>(); + qRegisterMetaType<QList<QRegion *>>(); + qRegisterMetaType<QSet<QRegion *>>(); + qRegisterMetaType<QRelationship *>(); + qRegisterMetaType<QList<QRelationship *>>(); + qRegisterMetaType<QSet<QRelationship *>>(); + qRegisterMetaType<QRemoveStructuralFeatureValueAction *>(); + qRegisterMetaType<QList<QRemoveStructuralFeatureValueAction *>>(); + qRegisterMetaType<QSet<QRemoveStructuralFeatureValueAction *>>(); + qRegisterMetaType<QRemoveVariableValueAction *>(); + qRegisterMetaType<QList<QRemoveVariableValueAction *>>(); + qRegisterMetaType<QSet<QRemoveVariableValueAction *>>(); + qRegisterMetaType<QReplyAction *>(); + qRegisterMetaType<QList<QReplyAction *>>(); + qRegisterMetaType<QSet<QReplyAction *>>(); + qRegisterMetaType<QSendObjectAction *>(); + qRegisterMetaType<QList<QSendObjectAction *>>(); + qRegisterMetaType<QSet<QSendObjectAction *>>(); + qRegisterMetaType<QSendSignalAction *>(); + qRegisterMetaType<QList<QSendSignalAction *>>(); + qRegisterMetaType<QSet<QSendSignalAction *>>(); + qRegisterMetaType<QSequenceNode *>(); + qRegisterMetaType<QList<QSequenceNode *>>(); + qRegisterMetaType<QSet<QSequenceNode *>>(); + qRegisterMetaType<QSignal *>(); + qRegisterMetaType<QList<QSignal *>>(); + qRegisterMetaType<QSet<QSignal *>>(); + qRegisterMetaType<QSignalEvent *>(); + qRegisterMetaType<QList<QSignalEvent *>>(); + qRegisterMetaType<QSet<QSignalEvent *>>(); + qRegisterMetaType<QSlot *>(); + qRegisterMetaType<QList<QSlot *>>(); + qRegisterMetaType<QSet<QSlot *>>(); + qRegisterMetaType<QStartClassifierBehaviorAction *>(); + qRegisterMetaType<QList<QStartClassifierBehaviorAction *>>(); + qRegisterMetaType<QSet<QStartClassifierBehaviorAction *>>(); + qRegisterMetaType<QStartObjectBehaviorAction *>(); + qRegisterMetaType<QList<QStartObjectBehaviorAction *>>(); + qRegisterMetaType<QSet<QStartObjectBehaviorAction *>>(); + qRegisterMetaType<QState *>(); + qRegisterMetaType<QList<QState *>>(); + qRegisterMetaType<QSet<QState *>>(); + qRegisterMetaType<QStateInvariant *>(); + qRegisterMetaType<QList<QStateInvariant *>>(); + qRegisterMetaType<QSet<QStateInvariant *>>(); + qRegisterMetaType<QStateMachine *>(); + qRegisterMetaType<QList<QStateMachine *>>(); + qRegisterMetaType<QSet<QStateMachine *>>(); + qRegisterMetaType<QStereotype *>(); + qRegisterMetaType<QList<QStereotype *>>(); + qRegisterMetaType<QSet<QStereotype *>>(); + qRegisterMetaType<QStringExpression *>(); + qRegisterMetaType<QList<QStringExpression *>>(); + qRegisterMetaType<QSet<QStringExpression *>>(); + qRegisterMetaType<QStructuralFeature *>(); + qRegisterMetaType<QList<QStructuralFeature *>>(); + qRegisterMetaType<QSet<QStructuralFeature *>>(); + qRegisterMetaType<QStructuralFeatureAction *>(); + qRegisterMetaType<QList<QStructuralFeatureAction *>>(); + qRegisterMetaType<QSet<QStructuralFeatureAction *>>(); + qRegisterMetaType<QStructuredActivityNode *>(); + qRegisterMetaType<QList<QStructuredActivityNode *>>(); + qRegisterMetaType<QSet<QStructuredActivityNode *>>(); + qRegisterMetaType<QStructuredClassifier *>(); + qRegisterMetaType<QList<QStructuredClassifier *>>(); + qRegisterMetaType<QSet<QStructuredClassifier *>>(); + qRegisterMetaType<QSubstitution *>(); + qRegisterMetaType<QList<QSubstitution *>>(); + qRegisterMetaType<QSet<QSubstitution *>>(); + qRegisterMetaType<QTemplateableElement *>(); + qRegisterMetaType<QList<QTemplateableElement *>>(); + qRegisterMetaType<QSet<QTemplateableElement *>>(); + qRegisterMetaType<QTemplateBinding *>(); + qRegisterMetaType<QList<QTemplateBinding *>>(); + qRegisterMetaType<QSet<QTemplateBinding *>>(); + qRegisterMetaType<QTemplateParameter *>(); + qRegisterMetaType<QList<QTemplateParameter *>>(); + qRegisterMetaType<QSet<QTemplateParameter *>>(); + qRegisterMetaType<QTemplateParameterSubstitution *>(); + qRegisterMetaType<QList<QTemplateParameterSubstitution *>>(); + qRegisterMetaType<QSet<QTemplateParameterSubstitution *>>(); + qRegisterMetaType<QTemplateSignature *>(); + qRegisterMetaType<QList<QTemplateSignature *>>(); + qRegisterMetaType<QSet<QTemplateSignature *>>(); + qRegisterMetaType<QTestIdentityAction *>(); + qRegisterMetaType<QList<QTestIdentityAction *>>(); + qRegisterMetaType<QSet<QTestIdentityAction *>>(); + qRegisterMetaType<QTimeConstraint *>(); + qRegisterMetaType<QList<QTimeConstraint *>>(); + qRegisterMetaType<QSet<QTimeConstraint *>>(); + qRegisterMetaType<QTimeEvent *>(); + qRegisterMetaType<QList<QTimeEvent *>>(); + qRegisterMetaType<QSet<QTimeEvent *>>(); + qRegisterMetaType<QTimeExpression *>(); + qRegisterMetaType<QList<QTimeExpression *>>(); + qRegisterMetaType<QSet<QTimeExpression *>>(); + qRegisterMetaType<QTimeInterval *>(); + qRegisterMetaType<QList<QTimeInterval *>>(); + qRegisterMetaType<QSet<QTimeInterval *>>(); + qRegisterMetaType<QTimeObservation *>(); + qRegisterMetaType<QList<QTimeObservation *>>(); + qRegisterMetaType<QSet<QTimeObservation *>>(); + qRegisterMetaType<QTransition *>(); + qRegisterMetaType<QList<QTransition *>>(); + qRegisterMetaType<QSet<QTransition *>>(); + qRegisterMetaType<QTrigger *>(); + qRegisterMetaType<QList<QTrigger *>>(); + qRegisterMetaType<QSet<QTrigger *>>(); + qRegisterMetaType<QType *>(); + qRegisterMetaType<QList<QType *>>(); + qRegisterMetaType<QSet<QType *>>(); + qRegisterMetaType<QTypedElement *>(); + qRegisterMetaType<QList<QTypedElement *>>(); + qRegisterMetaType<QSet<QTypedElement *>>(); + qRegisterMetaType<QUnmarshallAction *>(); + qRegisterMetaType<QList<QUnmarshallAction *>>(); + qRegisterMetaType<QSet<QUnmarshallAction *>>(); + qRegisterMetaType<QUsage *>(); + qRegisterMetaType<QList<QUsage *>>(); + qRegisterMetaType<QSet<QUsage *>>(); + qRegisterMetaType<QUseCase *>(); + qRegisterMetaType<QList<QUseCase *>>(); + qRegisterMetaType<QSet<QUseCase *>>(); + qRegisterMetaType<QValuePin *>(); + qRegisterMetaType<QList<QValuePin *>>(); + qRegisterMetaType<QSet<QValuePin *>>(); + qRegisterMetaType<QValueSpecification *>(); + qRegisterMetaType<QList<QValueSpecification *>>(); + qRegisterMetaType<QSet<QValueSpecification *>>(); + qRegisterMetaType<QValueSpecificationAction *>(); + qRegisterMetaType<QList<QValueSpecificationAction *>>(); + qRegisterMetaType<QSet<QValueSpecificationAction *>>(); + qRegisterMetaType<QVariable *>(); + qRegisterMetaType<QList<QVariable *>>(); + qRegisterMetaType<QSet<QVariable *>>(); + qRegisterMetaType<QVariableAction *>(); + qRegisterMetaType<QList<QVariableAction *>>(); + qRegisterMetaType<QSet<QVariableAction *>>(); + qRegisterMetaType<QVertex *>(); + qRegisterMetaType<QList<QVertex *>>(); + qRegisterMetaType<QSet<QVertex *>>(); + qRegisterMetaType<QWriteLinkAction *>(); + qRegisterMetaType<QList<QWriteLinkAction *>>(); + qRegisterMetaType<QSet<QWriteLinkAction *>>(); + qRegisterMetaType<QWriteStructuralFeatureAction *>(); + qRegisterMetaType<QList<QWriteStructuralFeatureAction *>>(); + qRegisterMetaType<QSet<QWriteStructuralFeatureAction *>>(); + qRegisterMetaType<QWriteVariableAction *>(); + qRegisterMetaType<QList<QWriteVariableAction *>>(); + qRegisterMetaType<QSet<QWriteVariableAction *>>(); if (scriptEngine) { qScriptRegisterMetaType(scriptEngine, qSetToScriptValue<QAbstraction>, scriptValueToQSet<QAbstraction>); @@ -1260,5 +1266,7 @@ void QUmlMetaModel::init(QScriptEngine *scriptEngine) } } -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE diff --git a/src/uml/qumlmetamodel.h b/src/uml/qumlmetamodel.h index 4ff19eac..04919eff 100644 --- a/src/uml/qumlmetamodel.h +++ b/src/uml/qumlmetamodel.h @@ -45,7 +45,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -55,7 +58,9 @@ public: static void init(QScriptEngine *scriptEngine = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qunmarshallaction.cpp b/src/uml/qunmarshallaction.cpp index a4afa1f4..89bfa1c9 100644 --- a/src/uml/qunmarshallaction.cpp +++ b/src/uml/qunmarshallaction.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QUnmarshallActionPrivate::QUnmarshallActionPrivate() : object(0), @@ -177,31 +180,33 @@ void QUnmarshallAction::setUnmarshallType(QClassifier *unmarshallType) void QUnmarshallAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The object to be unmarshalled."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The values of the structural features of the input object."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of the object to be unmarshalled."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The object to be unmarshalled."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The values of the structural features of the input object."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("results")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The type of the object to be unmarshalled."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUnmarshallAction")][QString::fromLatin1("unmarshallType")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qunmarshallaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qunmarshallaction.cpp" diff --git a/src/uml/qunmarshallaction.h b/src/uml/qunmarshallaction.h index 88e68e18..10c4d939 100644 --- a/src/uml/qunmarshallaction.h +++ b/src/uml/qunmarshallaction.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QUnmarshallAction : public QAction { Q_OBJECT - Q_PROPERTY(QInputPin * object READ object WRITE setObject) - Q_PROPERTY(QSet<QOutputPin *> results READ results) - Q_PROPERTY(QClassifier * unmarshallType READ unmarshallType WRITE setUnmarshallType) + Q_PROPERTY(QtUml::QInputPin * object READ object WRITE setObject) + Q_PROPERTY(QSet<QtUml::QOutputPin *> results READ results) + Q_PROPERTY(QtUml::QClassifier * unmarshallType READ unmarshallType WRITE setUnmarshallType) Q_DISABLE_COPY(QUnmarshallAction) Q_DECLARE_PRIVATE(QUnmarshallAction) @@ -92,7 +95,9 @@ protected: explicit QUnmarshallAction(QUnmarshallActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qunmarshallaction_p.h b/src/uml/qunmarshallaction_p.h index d24106ad..86d4adc9 100644 --- a/src/uml/qunmarshallaction_p.h +++ b/src/uml/qunmarshallaction_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -74,7 +77,9 @@ public: QClassifier *unmarshallType; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qusage.cpp b/src/uml/qusage.cpp index c6fa372f..85211129 100644 --- a/src/uml/qusage.cpp +++ b/src/uml/qusage.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QUsagePrivate::QUsagePrivate() { @@ -83,7 +86,9 @@ void QUsage::setPropertyData() QDependency::setPropertyData(); } -#include "moc_qusage.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qusage.cpp" diff --git a/src/uml/qusage.h b/src/uml/qusage.h index 4240340d..71fa80fe 100644 --- a/src/uml/qusage.h +++ b/src/uml/qusage.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QUsage(QUsagePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qusage_p.h b/src/uml/qusage_p.h index 59d8bf14..d49238ac 100644 --- a/src/uml/qusage_p.h +++ b/src/uml/qusage_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) class QUsage; @@ -63,7 +66,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qusecase.cpp b/src/uml/qusecase.cpp index 0c0a3b12..5465f028 100644 --- a/src/uml/qusecase.cpp +++ b/src/uml/qusecase.cpp @@ -49,7 +49,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QUseCasePrivate::QUseCasePrivate() { @@ -266,38 +269,40 @@ QSet<QUseCase *> QUseCase::allIncludedUseCases() const void QUseCase::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ExtensionPoints owned by the use case."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExtensionPoint::useCase"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Include relationships owned by this use case."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInclude::includingCase"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the subjects to which this use case applies. The subject or its parts realize all the use cases that apply to this subject. Use cases need not be attached to any specific subject, however. The subject may, but need not, own the use cases that apply to it."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::useCase"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Extend relationships owned by this use case."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExtend::extension"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the ExtensionPoints owned by the use case."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExtensionPoint::useCase"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Include relationships owned by this use case."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("includes")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QInclude::includingCase"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the subjects to which this use case applies. The subject or its parts realize all the use cases that apply to this subject. Use cases need not be attached to any specific subject, however. The subject may, but need not, own the use cases that apply to it."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("subjects")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QClassifier::useCase"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("References the Extend relationships owned by this use case."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamespace::ownedMembers"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QUseCase")][QString::fromLatin1("extends")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QExtend::extension"); QBehavioredClassifier::setPropertyData(); } -#include "moc_qusecase.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qusecase.cpp" diff --git a/src/uml/qusecase.h b/src/uml/qusecase.h index b7299511..9e8da407 100644 --- a/src/uml/qusecase.h +++ b/src/uml/qusecase.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,10 +70,10 @@ class Q_UML_EXPORT QUseCase : public QBehavioredClassifier { Q_OBJECT - Q_PROPERTY(QSet<QExtensionPoint *> extensionPoints READ extensionPoints) - Q_PROPERTY(QSet<QInclude *> includes READ includes) - Q_PROPERTY(QSet<QClassifier *> subjects READ subjects) - Q_PROPERTY(QSet<QExtend *> extends READ extends) + Q_PROPERTY(QSet<QtUml::QExtensionPoint *> extensionPoints READ extensionPoints) + Q_PROPERTY(QSet<QtUml::QInclude *> includes READ includes) + Q_PROPERTY(QSet<QtUml::QClassifier *> subjects READ subjects) + Q_PROPERTY(QSet<QtUml::QExtend *> extends READ extends) Q_DISABLE_COPY(QUseCase) Q_DECLARE_PRIVATE(QUseCase) @@ -102,7 +105,9 @@ protected: explicit QUseCase(QUseCasePrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qusecase_p.h b/src/uml/qusecase_p.h index 16fcdfe0..777249f1 100644 --- a/src/uml/qusecase_p.h +++ b/src/uml/qusecase_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -76,7 +79,9 @@ public: QSet<QExtend *> extends; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvaluepin.cpp b/src/uml/qvaluepin.cpp index 77943b87..64f3b7df 100644 --- a/src/uml/qvaluepin.cpp +++ b/src/uml/qvaluepin.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QValuePinPrivate::QValuePinPrivate() : value(0) @@ -116,17 +119,19 @@ void QValuePin::setValue(QValueSpecification *value) void QValuePin::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value that the pin will provide."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value that the pin will provide."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QInputPin::setPropertyData(); } -#include "moc_qvaluepin.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qvaluepin.cpp" diff --git a/src/uml/qvaluepin.h b/src/uml/qvaluepin.h index d6b1ee4c..4ae07d1d 100644 --- a/src/uml/qvaluepin.h +++ b/src/uml/qvaluepin.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QValuePin : public QInputPin { Q_OBJECT - Q_PROPERTY(QValueSpecification * value READ value WRITE setValue) + Q_PROPERTY(QtUml::QValueSpecification * value READ value WRITE setValue) Q_DISABLE_COPY(QValuePin) Q_DECLARE_PRIVATE(QValuePin) @@ -80,7 +83,9 @@ protected: explicit QValuePin(QValuePinPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvaluepin_p.h b/src/uml/qvaluepin_p.h index 501c3be7..5a1d0fd4 100644 --- a/src/uml/qvaluepin_p.h +++ b/src/uml/qvaluepin_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -67,7 +70,9 @@ public: QValueSpecification *value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvaluespecification.cpp b/src/uml/qvaluespecification.cpp index 182165d4..2979bc0c 100644 --- a/src/uml/qvaluespecification.cpp +++ b/src/uml/qvaluespecification.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QValueSpecificationPrivate::QValueSpecificationPrivate() { @@ -244,19 +247,19 @@ void QValueSpecification::setTemplateParameter(QTemplateParameter *templateParam /*! Indicates that packageable elements must always have a visibility, i.e., visibility is not optional. */ -QtUml::VisibilityKind QValueSpecification::visibility() const +QtUmlNS::VisibilityKind QValueSpecification::visibility() const { return (qwrappedobject_cast<const QPackageableElement *>(this))->visibility(); } -void QValueSpecification::setVisibility(QtUml::VisibilityKind visibility) +void QValueSpecification::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QPackageableElement *>(this))->setVisibility(visibility); } void QValueSpecification::unsetVisibility() { - setVisibility(QtUml::VisibilityPublic); + setVisibility(QtUmlNS::VisibilityPublic); Q_D(QValueSpecification); d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility")); } @@ -347,7 +350,9 @@ void QValueSpecification::setPropertyData() QWrappedObject::setPropertyData(); } -#include "moc_qvaluespecification.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qvaluespecification.cpp" diff --git a/src/uml/qvaluespecification.h b/src/uml/qvaluespecification.h index 40250d3c..23133851 100644 --- a/src/uml/qvaluespecification.h +++ b/src/uml/qvaluespecification.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,22 +69,22 @@ class Q_UML_EXPORT QValueSpecification : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(QString name READ name WRITE setName) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility RESET unsetVisibility) Q_DISABLE_COPY(QValueSpecification) Q_DECLARE_PRIVATE(QValueSpecification) @@ -121,8 +124,8 @@ public: Q_INVOKABLE void setTemplateParameter(QTemplateParameter *templateParameter); // Attributes from aggregated QPackageableElement - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE void unsetVisibility(); // Operations @@ -145,7 +148,9 @@ private: QPackageableElement *_wrappedPackageableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvaluespecification_p.h b/src/uml/qvaluespecification_p.h index 13709212..ed494ab2 100644 --- a/src/uml/qvaluespecification_p.h +++ b/src/uml/qvaluespecification_p.h @@ -53,7 +53,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -70,7 +73,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvaluespecificationaction.cpp b/src/uml/qvaluespecificationaction.cpp index 0a75ce16..83b07828 100644 --- a/src/uml/qvaluespecificationaction.cpp +++ b/src/uml/qvaluespecificationaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QValueSpecificationActionPrivate::QValueSpecificationActionPrivate() : value(0), @@ -147,24 +150,26 @@ void QValueSpecificationAction::setResult(QOutputPin *result) void QValueSpecificationAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value specification to be evaluated."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value specification to be evaluated."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QElement::ownedElements"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QValueSpecificationAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qvaluespecificationaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qvaluespecificationaction.cpp" diff --git a/src/uml/qvaluespecificationaction.h b/src/uml/qvaluespecificationaction.h index 5e633139..7aaf632f 100644 --- a/src/uml/qvaluespecificationaction.h +++ b/src/uml/qvaluespecificationaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QValueSpecificationAction : public QAction { Q_OBJECT - Q_PROPERTY(QValueSpecification * value READ value WRITE setValue) - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QValueSpecification * value READ value WRITE setValue) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) Q_DISABLE_COPY(QValueSpecificationAction) Q_DECLARE_PRIVATE(QValueSpecificationAction) @@ -84,7 +87,9 @@ protected: explicit QValueSpecificationAction(QValueSpecificationActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvaluespecificationaction_p.h b/src/uml/qvaluespecificationaction_p.h index 2e2a3fe7..bed03519 100644 --- a/src/uml/qvaluespecificationaction_p.h +++ b/src/uml/qvaluespecificationaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -69,7 +72,9 @@ public: QOutputPin *result; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvariable.cpp b/src/uml/qvariable.cpp index acbd0a28..9776bb3b 100644 --- a/src/uml/qvariable.cpp +++ b/src/uml/qvariable.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QVariablePrivate::QVariablePrivate() : scope(0), @@ -253,12 +256,12 @@ void QVariable::setName(QString name) /*! Determines where the NamedElement appears within different Namespaces within the overall model, and its accessibility. */ -QtUml::VisibilityKind QVariable::visibility() const +QtUmlNS::VisibilityKind QVariable::visibility() const { return (qwrappedobject_cast<const QNamedElement *>(this))->visibility(); } -void QVariable::setVisibility(QtUml::VisibilityKind visibility) +void QVariable::setVisibility(QtUmlNS::VisibilityKind visibility) { (qwrappedobject_cast<QNamedElement *>(this))->setVisibility(visibility); } @@ -454,24 +457,26 @@ bool QVariable::isAccessibleBy(const QAction *a) const void QVariable::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A structured activity node that owns the variable."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::variable"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("A structured activity node that owns the variable."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QStructuredActivityNode::variable"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An activity that owns the variable."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::variable"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("An activity that owns the variable."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariable")][QString::fromLatin1("activityScope")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QActivity::variable"); QWrappedObject::setPropertyData(); } -#include "moc_qvariable.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qvariable.cpp" diff --git a/src/uml/qvariable.h b/src/uml/qvariable.h index c8ac69c2..52d59ede 100644 --- a/src/uml/qvariable.h +++ b/src/uml/qvariable.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -65,33 +68,33 @@ class Q_UML_EXPORT QVariable : public QWrappedObject { Q_OBJECT - Q_PROPERTY(QSet<QElement *> ownedElements READ ownedElements) - Q_PROPERTY(QElement * owner READ owner) - Q_PROPERTY(QSet<QComment *> ownedComments READ ownedComments) + Q_PROPERTY(QSet<QtUml::QElement *> ownedElements READ ownedElements) + Q_PROPERTY(QtUml::QElement * owner READ owner) + Q_PROPERTY(QSet<QtUml::QComment *> ownedComments READ ownedComments) Q_PROPERTY(qint32 upper READ upper WRITE setUpper RESET unsetUpper STORED false) Q_PROPERTY(bool isUnique READ isUnique WRITE setUnique RESET unsetUnique) Q_PROPERTY(bool isOrdered READ isOrdered WRITE setOrdered RESET unsetOrdered) Q_PROPERTY(qint32 lower READ lower WRITE setLower STORED false) - Q_PROPERTY(QValueSpecification * upperValue READ upperValue WRITE setUpperValue) - Q_PROPERTY(QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) + Q_PROPERTY(QtUml::QValueSpecification * upperValue READ upperValue WRITE setUpperValue) + Q_PROPERTY(QtUml::QValueSpecification * lowerValue READ lowerValue WRITE setLowerValue) Q_PROPERTY(QString name READ name WRITE setName) - Q_PROPERTY(QtUml::VisibilityKind visibility READ visibility WRITE setVisibility) + Q_PROPERTY(QtUmlNS::VisibilityKind visibility READ visibility WRITE setVisibility) Q_PROPERTY(QString qualifiedName READ qualifiedName STORED false) - Q_PROPERTY(QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) - Q_PROPERTY(QNamespace * namespace_ READ namespace_) - Q_PROPERTY(QSet<QDependency *> clientDependencies READ clientDependencies) + Q_PROPERTY(QtUml::QStringExpression * nameExpression READ nameExpression WRITE setNameExpression) + Q_PROPERTY(QtUml::QNamespace * namespace_ READ namespace_) + Q_PROPERTY(QSet<QtUml::QDependency *> clientDependencies READ clientDependencies) - Q_PROPERTY(QType * type READ type WRITE setType) + Q_PROPERTY(QtUml::QType * type READ type WRITE setType) - Q_PROPERTY(QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) + Q_PROPERTY(QtUml::QTemplateParameter * owningTemplateParameter READ owningTemplateParameter WRITE setOwningTemplateParameter) - Q_PROPERTY(QList<QConnectorEnd *> ends READ ends STORED false) - Q_PROPERTY(QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) + Q_PROPERTY(QList<QtUml::QConnectorEnd *> ends READ ends STORED false) + Q_PROPERTY(QtUml::QConnectableElementTemplateParameter * templateParameter READ templateParameter WRITE setTemplateParameter) - Q_PROPERTY(QStructuredActivityNode * scope READ scope WRITE setScope) - Q_PROPERTY(QActivity * activityScope READ activityScope WRITE setActivityScope) + Q_PROPERTY(QtUml::QStructuredActivityNode * scope READ scope WRITE setScope) + Q_PROPERTY(QtUml::QActivity * activityScope READ activityScope WRITE setActivityScope) Q_DISABLE_COPY(QVariable) Q_DECLARE_PRIVATE(QVariable) @@ -129,8 +132,8 @@ public: // Attributes from aggregated QNamedElement Q_INVOKABLE QString name() const; Q_INVOKABLE void setName(QString name); - Q_INVOKABLE QtUml::VisibilityKind visibility() const; - Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility); + Q_INVOKABLE QtUmlNS::VisibilityKind visibility() const; + Q_INVOKABLE void setVisibility(QtUmlNS::VisibilityKind visibility); Q_INVOKABLE QString qualifiedName() const; // Association ends from aggregated QNamedElement @@ -173,7 +176,9 @@ private: QConnectableElement *_wrappedConnectableElement; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvariable_p.h b/src/uml/qvariable_p.h index f8422cd3..31f9e759 100644 --- a/src/uml/qvariable_p.h +++ b/src/uml/qvariable_p.h @@ -50,7 +50,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -72,7 +75,9 @@ public: QActivity *activityScope; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvariableaction.cpp b/src/uml/qvariableaction.cpp index 898ac6c5..2d69d814 100644 --- a/src/uml/qvariableaction.cpp +++ b/src/uml/qvariableaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QVariableActionPrivate::QVariableActionPrivate() : variable(0) @@ -108,17 +111,19 @@ void QVariableAction::setVariable(QVariable *variable) void QVariableAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Variable to be read."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Variable to be read."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QAction::setPropertyData(); } -#include "moc_qvariableaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qvariableaction.cpp" diff --git a/src/uml/qvariableaction.h b/src/uml/qvariableaction.h index e7e3464a..0a1f86d4 100644 --- a/src/uml/qvariableaction.h +++ b/src/uml/qvariableaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QVariableAction : public QAction { Q_OBJECT - Q_PROPERTY(QVariable * variable READ variable WRITE setVariable) + Q_PROPERTY(QtUml::QVariable * variable READ variable WRITE setVariable) Q_DISABLE_COPY(QVariableAction) Q_DECLARE_PRIVATE(QVariableAction) @@ -80,7 +83,9 @@ protected: explicit QVariableAction(QVariableActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvariableaction_p.h b/src/uml/qvariableaction_p.h index 90352558..9fa109ea 100644 --- a/src/uml/qvariableaction_p.h +++ b/src/uml/qvariableaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,7 +69,9 @@ public: QVariable *variable; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvertex.cpp b/src/uml/qvertex.cpp index 3478fb81..df978a0b 100644 --- a/src/uml/qvertex.cpp +++ b/src/uml/qvertex.cpp @@ -48,7 +48,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QVertexPrivate::QVertexPrivate() : container(0) @@ -217,31 +220,33 @@ QStateMachine *QVertex::containingStateMachine() const void QVertex::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the transitions entering this vertex."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTransition::target"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("container")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("container")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("container")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The region that contains this vertex."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("container")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("container")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("container")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::subvertex"); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the transitions departing from this vertex."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTransition::source"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the transitions entering this vertex."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTransition::target"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("container")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("container")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("container")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("The region that contains this vertex."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("container")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("container")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QNamedElement::namespace"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("container")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QRegion::subvertex"); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("none"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Specifies the transitions departing from this vertex."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QVertex")][QString::fromLatin1("outgoings")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1("QTransition::source"); QNamedElement::setPropertyData(); } -#include "moc_qvertex.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qvertex.cpp" diff --git a/src/uml/qvertex.h b/src/uml/qvertex.h index 7ae93b5d..dd6dce42 100644 --- a/src/uml/qvertex.h +++ b/src/uml/qvertex.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,9 +69,9 @@ class Q_UML_EXPORT QVertex : public QNamedElement { Q_OBJECT - Q_PROPERTY(QSet<QTransition *> incomings READ incomings STORED false) - Q_PROPERTY(QRegion * container READ container WRITE setContainer) - Q_PROPERTY(QSet<QTransition *> outgoings READ outgoings STORED false) + Q_PROPERTY(QSet<QtUml::QTransition *> incomings READ incomings STORED false) + Q_PROPERTY(QtUml::QRegion * container READ container WRITE setContainer) + Q_PROPERTY(QSet<QtUml::QTransition *> outgoings READ outgoings STORED false) Q_DISABLE_COPY(QVertex) Q_DECLARE_PRIVATE(QVertex) @@ -95,7 +98,9 @@ protected: explicit QVertex(QVertexPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qvertex_p.h b/src/uml/qvertex_p.h index cc274f35..552f3faf 100644 --- a/src/uml/qvertex_p.h +++ b/src/uml/qvertex_p.h @@ -51,7 +51,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -77,7 +80,9 @@ public: void removeOutgoing(QTransition *outgoing); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qwritelinkaction.cpp b/src/uml/qwritelinkaction.cpp index ebd89a0c..332c358b 100644 --- a/src/uml/qwritelinkaction.cpp +++ b/src/uml/qwritelinkaction.cpp @@ -44,7 +44,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QWriteLinkActionPrivate::QWriteLinkActionPrivate() { @@ -83,7 +86,9 @@ void QWriteLinkAction::setPropertyData() QLinkAction::setPropertyData(); } -#include "moc_qwritelinkaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qwritelinkaction.cpp" diff --git a/src/uml/qwritelinkaction.h b/src/uml/qwritelinkaction.h index 29c167e1..6f28091e 100644 --- a/src/uml/qwritelinkaction.h +++ b/src/uml/qwritelinkaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -71,7 +74,9 @@ protected: explicit QWriteLinkAction(QWriteLinkActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qwritelinkaction_p.h b/src/uml/qwritelinkaction_p.h index c0742723..53ca0f5a 100644 --- a/src/uml/qwritelinkaction_p.h +++ b/src/uml/qwritelinkaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,7 +65,9 @@ public: }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qwritestructuralfeatureaction.cpp b/src/uml/qwritestructuralfeatureaction.cpp index bee5101d..d3c996b1 100644 --- a/src/uml/qwritestructuralfeatureaction.cpp +++ b/src/uml/qwritestructuralfeatureaction.cpp @@ -47,7 +47,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QWriteStructuralFeatureActionPrivate::QWriteStructuralFeatureActionPrivate() : result(0), @@ -147,24 +150,26 @@ void QWriteStructuralFeatureAction::setValue(QInputPin *value) void QWriteStructuralFeatureAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); - - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value to be added or removed from the structural feature."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Gives the output pin on which the result is put."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::outputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value to be added or removed from the structural feature."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteStructuralFeatureAction")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QStructuralFeatureAction::setPropertyData(); } -#include "moc_qwritestructuralfeatureaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qwritestructuralfeatureaction.cpp" diff --git a/src/uml/qwritestructuralfeatureaction.h b/src/uml/qwritestructuralfeatureaction.h index 33f0baea..8b11a9ca 100644 --- a/src/uml/qwritestructuralfeatureaction.h +++ b/src/uml/qwritestructuralfeatureaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -62,8 +65,8 @@ class Q_UML_EXPORT QWriteStructuralFeatureAction : public QStructuralFeatureActi { Q_OBJECT - Q_PROPERTY(QOutputPin * result READ result WRITE setResult) - Q_PROPERTY(QInputPin * value READ value WRITE setValue) + Q_PROPERTY(QtUml::QOutputPin * result READ result WRITE setResult) + Q_PROPERTY(QtUml::QInputPin * value READ value WRITE setValue) Q_DISABLE_COPY(QWriteStructuralFeatureAction) Q_DECLARE_PRIVATE(QWriteStructuralFeatureAction) @@ -84,7 +87,9 @@ protected: explicit QWriteStructuralFeatureAction(QWriteStructuralFeatureActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qwritestructuralfeatureaction_p.h b/src/uml/qwritestructuralfeatureaction_p.h index 0fec8910..3c539272 100644 --- a/src/uml/qwritestructuralfeatureaction_p.h +++ b/src/uml/qwritestructuralfeatureaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -68,7 +71,9 @@ public: QInputPin *value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qwritevariableaction.cpp b/src/uml/qwritevariableaction.cpp index 4ca179c2..45db589c 100644 --- a/src/uml/qwritevariableaction.cpp +++ b/src/uml/qwritevariableaction.cpp @@ -46,7 +46,10 @@ #include <QtWrappedObjects/QtWrappedObjectsNamespace> -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QWriteVariableActionPrivate::QWriteVariableActionPrivate() : value(0) @@ -116,17 +119,19 @@ void QWriteVariableAction::setValue(QInputPin *value) void QWriteVariableAction::setPropertyData() { - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value to be added or removed from the variable."); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); - QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::IsDerivedUnionRole] = false; + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::DocumentationRole] = QString::fromLatin1("Value to be added or removed from the variable."); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::RedefinedPropertiesRole] = QString::fromLatin1(""); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::SubsettedPropertiesRole] = QString::fromLatin1("QAction::inputs"); + QWrappedObject::propertyDataHash[QString::fromLatin1("QtUml::QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::OppositeEndRole] = QString::fromLatin1(""); QVariableAction::setPropertyData(); } -#include "moc_qwritevariableaction.cpp" +} + +QT_END_NAMESPACE -QT_END_NAMESPACE_QTUML +#include "moc_qwritevariableaction.cpp" diff --git a/src/uml/qwritevariableaction.h b/src/uml/qwritevariableaction.h index 724c99ed..56b2d3d1 100644 --- a/src/uml/qwritevariableaction.h +++ b/src/uml/qwritevariableaction.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -61,7 +64,7 @@ class Q_UML_EXPORT QWriteVariableAction : public QVariableAction { Q_OBJECT - Q_PROPERTY(QInputPin * value READ value WRITE setValue) + Q_PROPERTY(QtUml::QInputPin * value READ value WRITE setValue) Q_DISABLE_COPY(QWriteVariableAction) Q_DECLARE_PRIVATE(QWriteVariableAction) @@ -80,7 +83,9 @@ protected: explicit QWriteVariableAction(QWriteVariableActionPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0); }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/uml/qwritevariableaction_p.h b/src/uml/qwritevariableaction_p.h index 99d37c22..365f0c8f 100644 --- a/src/uml/qwritevariableaction_p.h +++ b/src/uml/qwritevariableaction_p.h @@ -48,7 +48,10 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE_QTUML +QT_BEGIN_NAMESPACE + +namespace QtUml +{ QT_MODULE(QtUml) @@ -66,7 +69,9 @@ public: QInputPin *value; }; -QT_END_NAMESPACE_QTUML +} + +QT_END_NAMESPACE QT_END_HEADER diff --git a/src/wrappedobjects/qxmireader.cpp b/src/wrappedobjects/qxmireader.cpp index b58dbc2e..db4b978a 100644 --- a/src/wrappedobjects/qxmireader.cpp +++ b/src/wrappedobjects/qxmireader.cpp @@ -60,11 +60,12 @@ QXmiReaderPrivate::~QXmiReaderPrivate() { } -QXmiReader::QXmiReader(QScriptEngine *scriptEngine, QObject *parent) : +QXmiReader::QXmiReader(QScriptEngine *scriptEngine, bool initMetaModel, QObject *parent) : QObject(*new QXmiReaderPrivate, parent) { Q_D(QXmiReader); d->scriptEngine = scriptEngine; + d->initMetaModel = initMetaModel; loadPlugins(); } @@ -106,7 +107,8 @@ QWrappedObject *QXmiReader::readFile(QIODevice *device) foreach (const QXmlStreamNamespaceDeclaration &namespaceDeclaration, d->reader.namespaceDeclarations()) { QMetaModelPlugin *metaModelPlugin = d->metaModelPlugins.value(namespaceDeclaration.namespaceUri().toString()); if (metaModelPlugin) { - metaModelPlugin->initMetaModel(d->scriptEngine); + if (d->initMetaModel) + metaModelPlugin->initMetaModel(d->scriptEngine); d->xmlNamespaceToImplementationNamespace.insert(namespaceDeclaration.prefix().toString(), metaModelPlugin->metaModelNamespace()); } else { diff --git a/src/wrappedobjects/qxmireader.h b/src/wrappedobjects/qxmireader.h index 58310ce5..d6f28259 100644 --- a/src/wrappedobjects/qxmireader.h +++ b/src/wrappedobjects/qxmireader.h @@ -65,7 +65,7 @@ class Q_WRAPPEDOBJECTS_EXPORT QXmiReader : public QObject Q_DECLARE_PRIVATE(QXmiReader) public: - explicit QXmiReader(QScriptEngine *scriptEngine = 0, QObject *parent = 0); + explicit QXmiReader(QScriptEngine *scriptEngine = 0, bool initMetaModel = false, QObject *parent = 0); virtual ~QXmiReader(); QWrappedObject *readFile(QIODevice *device); diff --git a/src/wrappedobjects/qxmireader_p.h b/src/wrappedobjects/qxmireader_p.h index d9315b0e..171018ea 100644 --- a/src/wrappedobjects/qxmireader_p.h +++ b/src/wrappedobjects/qxmireader_p.h @@ -70,6 +70,7 @@ public: QHash<QString, QString> xmlNamespaceToImplementationNamespace; QStringList errors; QScriptEngine *scriptEngine; + bool initMetaModel; }; QT_END_NAMESPACE diff --git a/src/wrappedobjectswidgets/qwrappedobjectview.cpp b/src/wrappedobjectswidgets/qwrappedobjectview.cpp index d7919e39..158e0527 100644 --- a/src/wrappedobjectswidgets/qwrappedobjectview.cpp +++ b/src/wrappedobjectswidgets/qwrappedobjectview.cpp @@ -74,11 +74,13 @@ void QWrappedObjectViewPrivate::populateContextMenu(QMenu &menu, QWrappedObject if (propertyType.contains(QString::fromLatin1("QList")) || propertyType.contains(QString::fromLatin1("QSet")) || propertyType.endsWith(QString::fromLatin1("*"))) { if (propertyType.contains(QString::fromLatin1("QList")) || propertyType.contains(QString::fromLatin1("QSet"))) { propertyType = propertyType.remove(QString::fromLatin1("QList<")).remove(QString::fromLatin1("QSet<")).remove(QString::fromLatin1(">")); - methodSignature = QString::fromLatin1("add%1(%2)").arg(modifiedPropertyName).arg(propertyType); + QString unqualifiedPropertyType = propertyType; + methodSignature = QString::fromLatin1("add%1(%2)").arg(modifiedPropertyName).arg(unqualifiedPropertyType.remove(QRegularExpression(QString::fromLatin1("^.*::")))); actionText = QObject::tr("Add %1").arg(modifiedPropertyName); } else if (propertyType.endsWith(QString::fromLatin1("*"))) { - methodSignature = QString::fromLatin1("set%1(%2)").arg(modifiedPropertyName).arg(propertyType); + QString unqualifiedPropertyType = propertyType; + methodSignature = QString::fromLatin1("set%1(%2)").arg(modifiedPropertyName).arg(unqualifiedPropertyType.remove(QRegularExpression(QString::fromLatin1("^.*::")))); actionText = QObject::tr("Set %1").arg(modifiedPropertyName); } int metaMethodIndex; |